ncurses 6.2 - patch 20210227

[ncurses.git] / ncurses / build.priv.h

diff --git a/ncurses/build.priv.h b/ncurses/build.priv.h
index be00d73ea4309ac8ee6747e76f065982e1db320a..9014e74abf09433990b80c9d7cb04a2e44de1b4b 100644 (file)
--- a/ncurses/build.priv.h
+++ b/ncurses/build.priv.h
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2010 Free Software Foundation, Inc.                        *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2010,2012 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            *
@@ -30,13 +31,12 @@
  *  Author: Thomas E. Dickey                        2010                    *
  ****************************************************************************/
 
-
 /*
- * $Id: build.priv.h,v 1.6 2010/05/22 20:30:35 tom Exp $
+ * $Id: build.priv.h,v 1.12 2020/02/02 23:34:34 tom Exp $
  *
  *     build.priv.h
  *
- *     This is a reduced version of curses.priv.h, for build-time utilties.
+ *     This is a reduced version of curses.priv.h, for build-time utilities.
  *     Because it has fewer dependencies, this simplifies cross-compiling.
  *
  */
@@ -55,7 +55,7 @@ extern "C" {
 #if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
-#define MODULE_ID(id) /*nothing*/
+#define MODULE_ID(id)          /*nothing */
 #endif
 
 #include <stdlib.h>
@@ -67,7 +67,7 @@ extern "C" {
 
 #include <errno.h>
 
-#include <curses.h>    /* we'll use -Ipath directive to get the right one! */
+#include <curses.h>            /* we'll use -Ipath directive to get the right one! */
 
 /* usually in <unistd.h> */
 #ifndef EXIT_SUCCESS
@@ -78,31 +78,31 @@ extern "C" {
 #define EXIT_FAILURE 1
 #endif
 
-#define FreeAndNull(p)   free(p); p = 0
+#define FreeAndNull(p)   do { free(p); p = 0; } while (0)
 #define UChar(c)         ((unsigned char)(c))
 #define SIZEOF(v)        (sizeof(v) / sizeof(v[0]))
 
 #include <nc_alloc.h>
+#include <nc_string.h>
 
 /* declare these, to avoid needing term.h */
 #if BROKEN_LINKER || USE_REENTRANT
 #define NCURSES_ARRAY(name) \
        NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, name)
 
-NCURSES_ARRAY(boolnames);
-NCURSES_ARRAY(boolfnames);
-NCURSES_ARRAY(numnames);
-NCURSES_ARRAY(numfnames);
-NCURSES_ARRAY(strnames);
-NCURSES_ARRAY(strfnames);
+    NCURSES_ARRAY(boolnames);
+    NCURSES_ARRAY(boolfnames);
+    NCURSES_ARRAY(numnames);
+    NCURSES_ARRAY(numfnames);
+    NCURSES_ARRAY(strnames);
+    NCURSES_ARRAY(strfnames);
 #endif
 
 #if NO_LEAKS
-NCURSES_EXPORT(void) _nc_names_leaks(void);
+    NCURSES_EXPORT(void) _nc_names_leaks(void);
 #endif
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* CURSES_PRIV_H */
+#endif                         /* CURSES_PRIV_H */