aboutsummaryrefslogtreecommitdiff
path: root/ncurses/build.priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'ncurses/build.priv.h')
-rw-r--r--ncurses/build.priv.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/ncurses/build.priv.h b/ncurses/build.priv.h
index 096a4431bc1e..b175faf781c7 100644
--- a/ncurses/build.priv.h
+++ b/ncurses/build.priv.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 2010-2019,2020 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 *
@@ -31,11 +31,11 @@
****************************************************************************/
/*
- * $Id: build.priv.h,v 1.9 2012/02/22 22:17:02 tom Exp $
+ * $Id: build.priv.h,v 1.11 2020/01/18 17:03:32 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.
*
*/
@@ -54,7 +54,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>
@@ -66,7 +66,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
@@ -77,7 +77,7 @@ 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]))
@@ -89,20 +89,19 @@ extern "C" {
#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 */