X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fuse_window.c;h=8eb733919848ae7e835978a7c6fd746a8f532c49;hp=36578dd944239f2338dd9c8941b72dd4e74fc6cb;hb=4aaab5e7c855d212deaa53608a08de5648fd86f6;hpb=60014650d5e3f088e2d5e8835925cce96db00c33 diff --git a/ncurses/base/use_window.c b/ncurses/base/use_window.c index 36578dd9..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,47 +32,17 @@ #include -MODULE_ID("$Id: use_window.c,v 1.5 2008/03/29 20:24:15 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; - } - } -} - -NCURSES_EXPORT(void) -_nc_unlock_window(WINDOW *win) -{ - WINDOWLIST *p; - - 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_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); }