From 5242fefb471d1fb2d0f35a33bde3570e19acd4b1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 15 Jun 2013 14:11:43 -0400
Subject: [PATCH] Be consistent about #define'ing configure symbols as "1" not
 empty.

This is just neatnik-ism, since all the tests in the code are #ifdefs,
but we shouldn't specify symbols as "Define to 1 ..." and then not
actually define them that way.
---
 config/c-library.m4           | 15 ++++++++++-----
 configure                     | 12 ++++++------
 configure.in                  |  2 +-
 src/include/pg_config.h.win32 |  4 ++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/config/c-library.m4 b/config/c-library.m4
index c39fc8d878..1e3997bb1c 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -18,7 +18,8 @@ res = _timezone / 60;
   [pgac_cv_var_int_timezone=yes],
   [pgac_cv_var_int_timezone=no])])
 if test x"$pgac_cv_var_int_timezone" = xyes ; then
-  AC_DEFINE(HAVE_INT_TIMEZONE,, [Define to 1 if you have the global variable 'int timezone'.])
+  AC_DEFINE(HAVE_INT_TIMEZONE, 1,
+            [Define to 1 if you have the global variable 'int timezone'.])
 fi])# PGAC_VAR_INT_TIMEZONE
 
 
@@ -68,7 +69,8 @@ gettimeofday(tp,tzp);],
 [pgac_cv_func_gettimeofday_1arg=no],
 [pgac_cv_func_gettimeofday_1arg=yes])])
 if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
-  AC_DEFINE(GETTIMEOFDAY_1ARG,, [Define to 1 if gettimeofday() takes only 1 argument.])
+  AC_DEFINE(GETTIMEOFDAY_1ARG, 1,
+            [Define to 1 if gettimeofday() takes only 1 argument.])
 fi
 AH_VERBATIM(GETTIMEOFDAY_1ARG_,
 [@%:@ifdef GETTIMEOFDAY_1ARG
@@ -95,7 +97,8 @@ getpwuid_r(uid, space, buf, bufsize, result);],
 [pgac_cv_func_getpwuid_r_5arg=yes],
 [pgac_cv_func_getpwuid_r_5arg=no])])
 if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
-  AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
+  AC_DEFINE(GETPWUID_R_5ARG, 1,
+            [Define to 1 if getpwuid_r() takes a 5th argument.])
 fi
 ])# PGAC_FUNC_GETPWUID_R_5ARG
 
@@ -117,7 +120,8 @@ int strerror_r();
 [pgac_cv_func_strerror_r_int=yes],
 [pgac_cv_func_strerror_r_int=no])])
 if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
-  AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
+  AC_DEFINE(STRERROR_R_INT, 1,
+            [Define to 1 if strerror_r() returns a int.])
 fi
 ])# PGAC_FUNC_STRERROR_R_INT
 
@@ -210,7 +214,8 @@ sigaction(0, &act, &oact);],
 [pgac_cv_func_posix_signals=yes],
 [pgac_cv_func_posix_signals=no])])
 if test x"$pgac_cv_func_posix_signals" = xyes ; then
-  AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.])
+  AC_DEFINE(HAVE_POSIX_SIGNALS, 1,
+            [Define to 1 if you have the POSIX signal interface.])
 fi
 HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
 AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
diff --git a/configure b/configure
index ac3bcbebd2..7c662c3059 100755
--- a/configure
+++ b/configure
@@ -19492,7 +19492,7 @@ $as_echo "$pgac_cv_var_int_timezone" >&6; }
 if test x"$pgac_cv_var_int_timezone" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT_TIMEZONE /**/
+#define HAVE_INT_TIMEZONE 1
 _ACEOF
 
 fi
@@ -19660,7 +19660,7 @@ $as_echo "$pgac_cv_func_gettimeofday_1arg" >&6; }
 if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define GETTIMEOFDAY_1ARG /**/
+#define GETTIMEOFDAY_1ARG 1
 _ACEOF
 
 fi
@@ -20676,7 +20676,7 @@ $as_echo "$pgac_cv_var_PS_STRINGS" >&6; }
 if test "$pgac_cv_var_PS_STRINGS" = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_PS_STRINGS /**/
+#define HAVE_PS_STRINGS 1
 _ACEOF
 
 fi
@@ -23937,7 +23937,7 @@ $as_echo "$pgac_cv_func_getpwuid_r_5arg" >&6; }
 if test x"$pgac_cv_func_getpwuid_r_5arg" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define GETPWUID_R_5ARG /**/
+#define GETPWUID_R_5ARG 1
 _ACEOF
 
 fi
@@ -24000,7 +24000,7 @@ $as_echo "$pgac_cv_func_strerror_r_int" >&6; }
 if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define STRERROR_R_INT /**/
+#define STRERROR_R_INT 1
 _ACEOF
 
 fi
@@ -28638,7 +28638,7 @@ $as_echo "$pgac_cv_func_posix_signals" >&6; }
 if test x"$pgac_cv_func_posix_signals" = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_SIGNALS /**/
+#define HAVE_POSIX_SIGNALS 1
 _ACEOF
 
 fi
diff --git a/configure.in b/configure.in
index 91c46eeb94..58ece5b391 100644
--- a/configure.in
+++ b/configure.in
@@ -1267,7 +1267,7 @@ PS_STRINGS->ps_argvstr = "foo";],
 [pgac_cv_var_PS_STRINGS=yes],
 [pgac_cv_var_PS_STRINGS=no])])
 if test "$pgac_cv_var_PS_STRINGS" = yes ; then
-  AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS thing exists.])
+  AC_DEFINE([HAVE_PS_STRINGS], 1, [Define to 1 if the PS_STRINGS thing exists.])
 fi
 
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index a4928e5dca..54db287aff 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -185,7 +185,7 @@
 //#define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the global variable 'int timezone'. */
-#define HAVE_INT_TIMEZONE
+#define HAVE_INT_TIMEZONE 1
 
 /* Define to 1 if you have support for IPv6. */
 #define HAVE_IPV6 1
@@ -663,7 +663,7 @@
 /* #undef USE_UNNAMED_POSIX_SEMAPHORES */
 
 /* Define to select Win32-style semaphores. */
-#define USE_WIN32_SEMAPHORES
+#define USE_WIN32_SEMAPHORES 1
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */