diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-04-24 04:03:25 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-04-24 04:03:25 +0000 |
| commit | a16ffee73bcf017638849abd7be6f0269bc37964 (patch) | |
| tree | 01f55a55ebbcaced1b70186124353e38c06565fd /src | |
| parent | 732a1fd1d08c6151cc9574203f52fe59828910ad (diff) | |
| download | postgresql-a16ffee73bcf017638849abd7be6f0269bc37964.tar.gz | |
Fixes for BCC 5.5 compile of libpq. Backpatch to 8.1.X.
Mark Morgan Lloyd
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/port.h | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/bcc32.mak | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/include/port.h b/src/include/port.h index 556471f6de..a17ad800f0 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.90 2006/03/05 15:58:53 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.91 2006/04/24 04:03:24 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 f70f157395..2eee11460f 100644 --- 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)" |