ncurses 5.6 - patch 20080308

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

diff --git a/ncurses/base/use_window.c b/ncurses/base/use_window.c
index 8792cb47c37ef196b6ff2b8e612c7ba141ecb459..578dff3aecfbe4c96304766154c932b988eb6b9f 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,7 +32,7 @@
 
 #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 $")
+MODULE_ID("$Id: use_window.c,v 1.4 2008/03/02 11:42:37 tom Exp $")

 
 #ifdef USE_PTHREADS
 NCURSES_EXPORT(void)
 
 #ifdef USE_PTHREADS
 NCURSES_EXPORT(void)


@@ -43,11 +43,10 @@ _nc_lock_window(WINDOW *win)
     _nc_lock_global(windowlist);
     for (p = _nc_windows; p != 0; p = p->next) {
        if (&(p->win) == win) {
     _nc_lock_global(windowlist);
     for (p = _nc_windows; p != 0; p = p->next) {
        if (&(p->win) == win) {

-           pthread_mutex_lock(&(p->mutex_use_window));
+           _nc_mutex_lock(&(p->mutex_use_window));

            break;
        }
     }
            break;
        }
     }

-    _nc_unlock_global(windowlist);

 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)


@@ -55,10 +54,9 @@ _nc_unlock_window(WINDOW *win)
 {
     WINDOWLIST *p;
 
 {
     WINDOWLIST *p;
 

-    _nc_lock_global(windowlist);

     for (p = _nc_windows; p != 0; p = p->next) {
        if (&(p->win) == win) {
     for (p = _nc_windows; p != 0; p = p->next) {
        if (&(p->win) == win) {

-           pthread_mutex_unlock(&(p->mutex_use_window));
+           _nc_mutex_unlock(&(p->mutex_use_window));

            break;
        }
     }
            break;
        }
     }