X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_data.c;h=21b854b92b6f840cc56df61c9d7df4cacca7ad68;hp=f7e6ef4da0a650de240fceb8b7457f29032814c2;hb=25358bc041a5566ce2de4c9c792837e552b35671;hpb=7a27c7d49c2e8b4a1ecbe85b4423d647cbc75ea5 diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c index f7e6ef4d..21b854b9 100644 --- a/ncurses/tinfo/lib_data.c +++ b/ncurses/tinfo/lib_data.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-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 * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: lib_data.c,v 1.24 2007/04/21 23:55:13 tom Exp $") +MODULE_ID("$Id: lib_data.c,v 1.39 2008/01/13 01:21:59 tom Exp $") /* * OS/2's native linker complains if we don't initialize public data when @@ -131,6 +131,8 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { NULL, /* first_name */ NULL, /* keyname_table */ + 0, /* slk_format */ + NULL, /* safeprint_buf */ 0, /* safeprint_used */ @@ -176,6 +178,15 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { #endif /* USE_TERMLIB */ #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_tst_tracef */ + PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */ + 0, /* nested_tracef */ +#endif }; #define STACK_FRAME_0 { { 0 }, 0 } @@ -210,8 +221,36 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { NUM_VARS_0s, /* dynamic_var */ NUM_VARS_0s, /* static_vars */ }, + NULL, /* saved_tty */ #if BROKEN_LINKER || USE_REENTRANT NULL, /* real_acs_map */ + 0, /* LINES */ + 0, /* COLS */ +#ifdef TRACE + 0L, /* _outchars */ + NULL, /* _tputs_trace */ +#endif #endif }; /* *INDENT-ON* */ + +/******************************************************************************/ +#ifdef USE_PTHREADS +NCURSES_EXPORT(int) +_nc_mutex_lock(pthread_mutex_t *obj) +{ + return pthread_mutex_lock(obj); +} + +NCURSES_EXPORT(int) +_nc_mutex_trylock(pthread_mutex_t *obj) +{ + return pthread_mutex_trylock(obj); +} + +NCURSES_EXPORT(int) +_nc_mutex_unlock(pthread_mutex_t *obj) +{ + return pthread_mutex_unlock(obj); +} +#endif /* USE_PTHREADS */