ncurses 6.0 - patch 20170212

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

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 4d29cd20648c5402702196743c5484d90e43935e..41fc674d415078ba4306d2131aaeec526e80374b 100644 (file)
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_data.c,v 1.64 2012/07/14 21:01:49 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -114,6 +114,7 @@ NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data
 #define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 }
 
 NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
+    0,                         /* have_sigtstp */
     0,                         /* have_sigwinch */
     0,                         /* cleanup_nested */
 
@@ -132,6 +133,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 
     NULL,                      /* first_name */
     NULL,                      /* keyname_table */
+    0,                         /* init_keyname */
 
     0,                         /* slk_format */
 
@@ -166,10 +168,11 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #endif
 
 #ifdef TRACE
-    FALSE,                     /* init_trace */
+    FALSE,                     /* trace_opened */
     CHARS_0s,                  /* trace_fname */
     0,                         /* trace_level */
     NULL,                      /* trace_fp */
+    -1,                                /* trace_fd */
 
     NULL,                      /* tracearg_buf */
     0,                         /* tracearg_used */
@@ -202,6 +205,9 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
 #if USE_PTHREADS_EINTR
     0,                         /* read_thread */
 #endif
+#if USE_WIDEC_SUPPORT
+    CHARS_0s,                  /* key_name */
+#endif
 };
 
 #define STACK_FRAME_0  { { 0 }, 0 }
@@ -369,7 +375,7 @@ _nc_sigprocmask(int how, const sigset_t * newmask, sigset_t * oldmask)
     if ((pthread_sigmask))
        return pthread_sigmask(how, newmask, oldmask);
     else
-       return sigprocmask(how, newmask, oldmask);
+       return (sigprocmask) (how, newmask, oldmask);
 }
 #endif
 #endif /* USE_PTHREADS */