diff options
| author | Bryan Henderson <bryanh@giraffe.netgate.net> | 1997-01-14 08:05:36 +0000 |
|---|---|---|
| committer | Bryan Henderson <bryanh@giraffe.netgate.net> | 1997-01-14 08:05:36 +0000 |
| commit | 05b0f22900ad45bda04caa04f7094ebcf81da0f5 (patch) | |
| tree | 3f1101b81565da1b931d5f187c8ab7d1edd7c4c5 /src/backend/utils/init/globals.c | |
| parent | 025f281dca9e36dfe6d6b2fa7287553352f606fd (diff) | |
Eliminate dupliclate definition of external variables reldesc and DataDir.
Some compilers recognize this error.
Diffstat (limited to 'src/backend/utils/init/globals.c')
| -rw-r--r-- | src/backend/utils/init/globals.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 2326ca1cf91..ccc93783022 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.3 1996/11/14 10:24:38 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.4 1997/01/14 08:05:36 bryanh Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -41,8 +41,12 @@ int Noversion = 0; int Quiet = 1; int MasterPid; -char* DataDir; - +char *DataDir; + /* The PGDATA directory user says to use, or defaults to via environment + variable. NULL if no option given and no environment variable set + */ +Relation reldesc; /* current relation descriptor */ + char OutputFileName[MAXPGPATH] = ""; BackendId MyBackendId; |