ncurses 5.6 - patch 20080621

[ncurses.git] / ncurses / tinfo / lib_data.c

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index ba37e5dc8c49b34b594bf33f3bf4e4d6227b2a7c..f09ad226f99c9eacce470a08a919d18087bb0341 100644 (file)
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_data.c,v 1.43 2008/03/29 21:16:49 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.48 2008/06/07 14:03:15 tom Exp $")

 
 /*
  * OS/2's native linker complains if we don't initialize public data when
 
 /*
  * OS/2's native linker complains if we don't initialize public data when


@@ -168,8 +168,6 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     NULL,                      /* tracedmp_buf */
     0,                         /* tracedmp_used */
 
     NULL,                      /* tracedmp_buf */
     0,                         /* tracedmp_used */
 

-    CHARS_0s,                  /* tracemse_buf */
-

     NULL,                      /* tracetry_buf */
     0,                         /* tracetry_used */
 
     NULL,                      /* tracetry_buf */
     0,                         /* tracetry_used */
 


@@ -179,10 +177,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 
 #endif /* TRACE */
 #ifdef USE_PTHREADS
 
 #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 */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
     0,                         /* nested_tracef */


@@ -226,6 +221,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
     NULL,                      /* real_acs_map */
     0,                         /* LINES */
     0,                         /* COLS */
     NULL,                      /* real_acs_map */
     0,                         /* LINES */
     0,                         /* COLS */

+    0,                         /* cur_term */

 #ifdef TRACE
     0L,                                /* _outchars */
     NULL,                      /* _tputs_trace */
 #ifdef TRACE
     0L,                                /* _outchars */
     NULL,                      /* _tputs_trace */


@@ -243,10 +239,7 @@ init_global_mutexes(void)
 
     if (!initialized) {
        initialized = TRUE;
 
     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);
     }
        _nc_mutex_init(&_nc_globals.mutex_tst_tracef);
        _nc_mutex_init(&_nc_globals.mutex_tracef);
     }