1-line fix to port/thread.c for compiling libpq with Borland C
Below please find a tiny patch to PostgreSQL-7.4.1 src/port/thread.c that I
found was necessary to compile libpq on Windows using Borland C++ Builder.
The patch causes the the WIN32 code to be included, and <pwd.h> skipped, if
under either WIN32 compiler, rather than just with MSVC.
(Alternative is to just use "#if defined(WIN32)", which works for me, but
I don't know if that would be safe.)
*** src/port/thread.c.orig Mon Nov 24 08:11:27 2003
--- src/port/thread.c Tue Feb 24 19:19:35 2004
***************
*** 16,22 ****
#include <sys/types.h>
#include <errno.h>
! #if defined(WIN32) && defined(_MSC_VER)
#undef ERROR
#else
#include <pwd.h>
--- 16,22 ----
#include <sys/types.h>
#include <errno.h>
! #if defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))
#undef ERROR
#else
#include <pwd.h>
Patch applied. Seem that was the only missing place. Backpatched to
7.4.X.
---------------------------------------------------------------------------
L J Bayuk wrote:
Below please find a tiny patch to PostgreSQL-7.4.1 src/port/thread.c that I
found was necessary to compile libpq on Windows using Borland C++ Builder.
The patch causes the the WIN32 code to be included, and <pwd.h> skipped, if
under either WIN32 compiler, rather than just with MSVC.
(Alternative is to just use "#if defined(WIN32)", which works for me, but
I don't know if that would be safe.)*** src/port/thread.c.orig Mon Nov 24 08:11:27 2003 --- src/port/thread.c Tue Feb 24 19:19:35 2004 *************** *** 16,22 ****#include <sys/types.h> #include <errno.h> ! #if defined(WIN32) && defined(_MSC_VER) #undef ERROR #else #include <pwd.h> --- 16,22 ----#include <sys/types.h>
#include <errno.h>
! #if defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))
#undef ERROR
#else
#include <pwd.h>---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings
--
Bruce Momjian | http://candle.pha.pa.us
pgman@candle.pha.pa.us | (610) 359-1001
+ If your life is a hard drive, | 13 Roberts Road
+ Christ can be your backup. | Newtown Square, Pennsylvania 19073