Re: Compiling libpq with VisualC - Mailing list pgsql-patches

From Andreas Pflug
Subject Re: Compiling libpq with VisualC
Date
Msg-id 40D49DA2.7090400@pse-consulting.de
Whole thread Raw
In response to Re: Compiling libpq with VisualC  (Bruce Momjian <pgman@candle.pha.pa.us>)
Responses Re: Compiling libpq with VisualC  (Tom Lane <tgl@sss.pgh.pa.us>)
List pgsql-patches
Two minor tweaks:

<sys/time.h> in libpq-be.h isn't present on win32 vc6. Apparently, it
isn't used in Linux either; libpq will compile without it. All usages of
gettimeofday throughout the backend don't seem connection related, so
libpq-be.h seems an odd place to include it.

ERROR in elog.h has conflicts with a win32 defined macro; #undef WIN32
solves the conflict (or not including elog.h for libpq purposes would do
too)

Regards,
Andreas
Index: include/libpq/libpq-be.h
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/include/libpq/libpq-be.h,v
retrieving revision 1.45
diff -u -r1.45 libpq-be.h
--- include/libpq/libpq-be.h    21 May 2004 05:08:04 -0000    1.45
+++ include/libpq/libpq-be.h    19 Jun 2004 19:46:52 -0000
@@ -18,7 +18,10 @@
 #ifndef LIBPQ_BE_H
 #define LIBPQ_BE_H

+#ifndef WIN32
 #include <sys/time.h>
+#endif
+

 #ifdef USE_SSL
 #include <openssl/ssl.h>

Index: include/utils/elog.h
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/include/utils/elog.h,v
retrieving revision 1.68
diff -u -r1.68 elog.h
--- include/utils/elog.h    5 Apr 2004 03:02:10 -0000    1.68
+++ include/utils/elog.h    19 Jun 2004 19:46:53 -0000
@@ -14,6 +14,10 @@
 #ifndef ELOG_H
 #define ELOG_H

+#ifdef ERROR
+#undef ERROR    /* possible conflict in win32 */
+#endif
+
 /* Error level codes */
 #define DEBUG5        10            /* Debugging messages, in categories of
                                  * decreasing detail. */

pgsql-patches by date:

Previous
From: "Dave Page"
Date:
Subject: Re: eventlog fix
Next
From: Tom Lane
Date:
Subject: Re: eventlog fix