ncurses 5.6 - patch 20080823

[ncurses.git] / ncurses / base / use_window.c

diff --git a/ncurses/base/use_window.c b/ncurses/base/use_window.c
index 8792cb47c37ef196b6ff2b8e612c7ba141ecb459..f6408c37928e75fcbd4cfe9bad750fa4d4f8a3c3 100644 (file)
--- a/ncurses/base/use_window.c
+++ b/ncurses/base/use_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,49 +32,17 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: use_window.c,v 1.2 2007/10/20 19:57:55 tom Exp $")
-
-#ifdef USE_PTHREADS
-NCURSES_EXPORT(void)
-_nc_lock_window(WINDOW *win)
-{
-    WINDOWLIST *p;
-
-    _nc_lock_global(windowlist);
-    for (p = _nc_windows; p != 0; p = p->next) {
-       if (&(p->win) == win) {
-           pthread_mutex_lock(&(p->mutex_use_window));
-           break;
-       }
-    }
-    _nc_unlock_global(windowlist);
-}
-
-NCURSES_EXPORT(void)
-_nc_unlock_window(WINDOW *win)
-{
-    WINDOWLIST *p;
-
-    _nc_lock_global(windowlist);
-    for (p = _nc_windows; p != 0; p = p->next) {
-       if (&(p->win) == win) {
-           pthread_mutex_unlock(&(p->mutex_use_window));
-           break;
-       }
-    }
-    _nc_unlock_global(windowlist);
-}
-#endif
+MODULE_ID("$Id: use_window.c,v 1.8 2008/06/07 14:13:46 tom Exp $")

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-use_window(WINDOW *win, NCURSES_CALLBACK func, void *data)
+use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data)

 {
     int code = OK;
 
     T((T_CALLED("use_window(%p,%p,%p)"), win, func, data));
 {
     int code = OK;
 
     T((T_CALLED("use_window(%p,%p,%p)"), win, func, data));

-    _nc_lock_window(win);
+    _nc_lock_global(curses);

     code = func(win, data);
     code = func(win, data);

-    _nc_unlock_window(win);
+    _nc_unlock_global(curses);

 
     returnCode(code);
 }
 
     returnCode(code);
 }