X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_data.c;h=d959509e69f3beb76afb99dbd01049134de9613c;hb=3ce60e9f58cc00309981ed711d0b0d3362105881;hp=ae8cd16e1919689cf762f3ae4e286a71b1f5475d;hpb=bd7ef7c2309fd00aa4576168c46f557c622cb9c3;p=ncurses.git

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index ae8cd16e..d959509e 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.47 2008/05/31 19:44:36 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.49 2008/06/28 12:46:53 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -177,10 +177,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 
 #endif /* TRACE */
 #ifdef USE_PTHREADS
-    PTHREAD_MUTEX_INITIALIZER,	/* mutex_set_SP */
-    PTHREAD_MUTEX_INITIALIZER,	/* mutex_use_screen */
-    PTHREAD_MUTEX_INITIALIZER,	/* mutex_use_window */
-    PTHREAD_MUTEX_INITIALIZER,	/* mutex_windowlist */
+    PTHREAD_MUTEX_INITIALIZER,	/* mutex_curses */
     PTHREAD_MUTEX_INITIALIZER,	/* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER,	/* mutex_tracef */
     0,				/* nested_tracef */
@@ -220,6 +217,9 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
 	NUM_VARS_0s,		/* static_vars */
     },
     NULL,			/* saved_tty */
+#if NCURSES_NO_PADDING
+    FALSE,			/* flag to set if padding disabled  */
+#endif
 #if BROKEN_LINKER || USE_REENTRANT
     NULL,			/* real_acs_map */
     0,				/* LINES */
@@ -242,10 +242,7 @@ init_global_mutexes(void)
 
     if (!initialized) {
 	initialized = TRUE;
-	_nc_mutex_init(&_nc_globals.mutex_set_SP);
-	_nc_mutex_init(&_nc_globals.mutex_use_screen);
-	_nc_mutex_init(&_nc_globals.mutex_use_window);
-	_nc_mutex_init(&_nc_globals.mutex_windowlist);
+	_nc_mutex_init(&_nc_globals.mutex_curses);
 	_nc_mutex_init(&_nc_globals.mutex_tst_tracef);
 	_nc_mutex_init(&_nc_globals.mutex_tracef);
     }