From: David Rowley <drowley@postgresql.org>
Date: Tue, 6 Apr 2021 21:51:33 +0000 (+1200)
Subject: Fix compiler warning for MSVC in libpq_pipeline.c
X-Git-Tag: REL_14_BETA1~314
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b82d990ab784881153c0f127e4c1211e9b6065c;p=thirdparty%2Fpostgresql.git

Fix compiler warning for MSVC in libpq_pipeline.c

DEBUG was already defined by the MSVC toolchain for "Debug" builds. On
these systems the unconditional #define DEBUG was causing a 'DEBUG': macro
redefinition warning.

Here we rename DEBUG to DEBUG_OUPUT and also get rid of the #define which
defined this constant.  This appears to have been left in the code by
mistake.

Discussion: https://postgr.es/m/CAApHDvqTTgDm38s4HRj03nhzhzQ1oMOj-RXFUB1pE6Bj07jyuQ@mail.gmail.com
---

diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c
index 95ffaae9f67..e4bba103ed1 100644
--- a/src/test/modules/libpq_pipeline/libpq_pipeline.c
+++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c
@@ -35,8 +35,7 @@ const char *const progname = "libpq_pipeline";
 char	   *tracefile = NULL;	/* path to PQtrace() file */
 
 
-#define DEBUG
-#ifdef DEBUG
+#ifdef DEBUG_OUTPUT
 #define	pg_debug(...)  do { fprintf(stderr, __VA_ARGS__); } while (0)
 #else
 #define pg_debug(...)