From 05b0f22900ad45bda04caa04f7094ebcf81da0f5 Mon Sep 17 00:00:00 2001 From: Bryan Henderson Date: Tue, 14 Jan 1997 08:05:36 +0000 Subject: [PATCH] Eliminate dupliclate definition of external variables reldesc and DataDir. Some compilers recognize this error. --- src/backend/bootstrap/bootstrap.c | 3 +-- src/backend/postmaster/postmaster.c | 7 +------ src/backend/tcop/postgres.c | 5 ++--- src/backend/utils/init/globals.c | 10 +++++++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index b7c25f6633..f66366ca3a 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.13 1996/12/26 22:06:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.14 1997/01/14 08:04:42 bryanh Exp $ * *------------------------------------------------------------------------- */ @@ -184,7 +184,6 @@ static struct typmap *Ap = (struct typmap *)NULL; static int Warnings = 0; static char Blanks[MAXATTR]; -Relation reldesc; /* current relation descriptor */ static char *relname; /* current relation name */ AttributeTupleForm attrtypes[MAXATTR]; /* points to attribute info */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6146a52d37..7cbe7570df 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.30 1996/12/26 22:07:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.31 1997/01/14 08:05:19 bryanh Exp $ * * NOTES * @@ -119,11 +119,6 @@ static short ActiveBackends = FALSE; static int NextBackendId = MAXINT; /* XXX why? */ static char *progname = (char *) NULL; -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 - */ - /* * Default Values */ diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 5dea9ede2a..09ee96fca5 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.24 1996/12/26 22:07:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.25 1997/01/14 08:05:26 bryanh Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -100,7 +100,6 @@ int dontExecute = 0; static int ShowStats; static bool IsEmptyQuery = false; -Relation reldesc; /* current relation descritor */ char relname[80]; /* current relation name */ #if defined(WIN32) || defined(next) @@ -1272,7 +1271,7 @@ PostgresMain(int argc, char *argv[]) */ if (IsUnderPostmaster == false) { puts("\nPOSTGRES backend interactive interface"); - puts("$Revision: 1.24 $ $Date: 1996/12/26 22:07:40 $"); + puts("$Revision: 1.25 $ $Date: 1997/01/14 08:05:26 $"); } /* ---------------- diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 2326ca1cf9..ccc9378302 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; -- 2.11.0