This fixes clashing defines of ERROR. On win32, winapi.h is included, which

includes windows.h, which #defines ERROR to 0. PostgreSQL's logging functions
define ERROR to -1. This patch redefines ERROR to -1 to avoid current or
future breakage of the logging functions.

Gerhard H?ring

diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 48e304d975300406c255a63bd9fc45a78b1f30bb..c7afe170e06bb347327b672bbb0f968fdd404750 100644 (file)
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.58 2001/08/21 00:33:27 momjian Exp $
+ * $Id: pqcomm.h,v 1.59 2001/09/06 03:18:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,11 @@
 #include <sys/types.h>
 #ifdef WIN32
 #include <winsock.h>
+/* workaround for clashing defines of "ERROR" */
+#ifdef ELOG_H
+#undef ERROR
+#define ERROR  (-1)
+#endif
 #else                                                  /* not WIN32 */
 #include <sys/socket.h>
 #ifdef HAVE_SYS_UN_H