Fixes for BCC 5.5 compile of libpq. Backpatch to 8.1.X.

Mark Morgan Lloyd

diff --git a/src/include/port.h b/src/include/port.h
index c163a3902e213ea28eb68204420ae8057debb849..3fb9b78a01f2c20722a6aff3222687524934159c 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/port.h,v 1.84.2.5 2006/03/05 05:33:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.84.2.6 2006/04/24 04:03:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -255,10 +255,8 @@ extern int win32_open(const char *, int,...);
 #define                open(a,b,...)   win32_open(a,b,##__VA_ARGS__)
 #endif
 
-#ifndef __BORLANDC__
 #define popen(a,b) _popen(a,b)
 #define pclose(a) _pclose(a)
-#endif
 
 /* Missing rand functions */
 extern long lrand48(void);

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index f70f157395dd40e99dda0aa75fa05d490d1a1c1f..2eee11460f88c75fd987b93751224abc304eccaf 100644 (file)
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -141,7 +141,7 @@ config: ..\..\include\pg_config.h pg_config_paths.h
 
 # Have to use \# so # isn't treated as a comment, but MSVC doesn't like this
 pg_config_paths.h: bcc32.mak
-       echo \#define SYSCONFDIR "" > pg_config_paths.h
+       echo \#define SYSCONFDIR \"\" > pg_config_paths.h
 
 "$(OUTDIR)" :
        @if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"