diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-03-23 23:16:49 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-03-23 23:16:49 +0000 |
| commit | 6d79d6027c61832cedf60757c83607495b3ee3a2 (patch) | |
| tree | 6add79387710d6df82fdf55d2cff81dc817f2149 /src | |
| parent | f8645018bc2a54865ebde317556ba342b03e1402 (diff) | |
| download | postgresql-6d79d6027c61832cedf60757c83607495b3ee3a2.tar.gz postgresql-6d79d6027c61832cedf60757c83607495b3ee3a2.zip | |
>> 5. empty define that results in an empty but terminated line ( ; )
easy (maybe dumb) fix for 5 in attachment define.patch
greetings, Andreas
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tcop/postgres.c | 6 | ||||
| -rw-r--r-- | src/include/utils/ps_status.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 7d3aed5a834..a70418637f7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.147 2000/03/01 02:39:46 ishii Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.148 2000/03/23 23:16:48 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -97,7 +97,9 @@ CommandDest whereToSendOutput = Debug; /* Define status buffer needed by PS_SET_STATUS */ +#ifdef PS_DEFINE_BUFFER PS_DEFINE_BUFFER; +#endif extern void BaseInit(void); extern void StartupXLOG(void); @@ -1503,7 +1505,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.147 $ $Date: 2000/03/01 02:39:46 $\n"); + puts("$Revision: 1.148 $ $Date: 2000/03/23 23:16:48 $\n"); } /* diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 014105b2c80..0058e56ae3f 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -50,7 +50,7 @@ char *ps_status_buffer = NULL extern char Ps_status_buffer[]; -#define PS_DEFINE_BUFFER +#undef PS_DEFINE_BUFFER #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \ { \ @@ -75,7 +75,7 @@ extern char Ps_status_buffer[]; #endif #ifdef NO_PS_STATUS -#define PS_DEFINE_BUFFER +#undef PS_DEFINE_BUFFER #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) #define PS_CLEAR_STATUS() #define PS_SET_STATUS(status) { if ((status)); } |