X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fuse_window.c;h=8eb733919848ae7e835978a7c6fd746a8f532c49;hp=4c9b1375f288b839b7a65186948c92c01f5ab828;hb=70322aa06a4a97ebff76d2869ad923cdf51ee0a9;hpb=c4d90db4f4e50bb8a971955ce4812262da4a50bc;ds=sidebyside

diff --git a/ncurses/base/use_window.c b/ncurses/base/use_window.c
index 4c9b1375..8eb73391 100644
--- a/ncurses/base/use_window.c
+++ b/ncurses/base/use_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2007-2008,2009 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            *
@@ -32,49 +32,17 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: use_window.c,v 1.3 2008/01/13 00:36:22 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) {
-	    _nc_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) {
-	    _nc_mutex_unlock(&(p->mutex_use_window));
-	    break;
-	}
-    }
-    _nc_unlock_global(windowlist);
-}
-#endif
+MODULE_ID("$Id: use_window.c,v 1.9 2009/10/24 22:40:24 tom Exp $")
 
 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));
-    _nc_lock_window(win);
+    T((T_CALLED("use_window(%p,%p,%p)"), (void *) win, func, data));
+    _nc_lock_global(curses);
     code = func(win, data);
-    _nc_unlock_window(win);
+    _nc_unlock_global(curses);
 
     returnCode(code);
 }