Commit05b0f22

Bryan Henderson

committed

Eliminate dupliclate definition of external variables reldesc and DataDir.

Some compilers recognize this error.

1 parent025f281 commit05b0f22Copy full SHA for 05b0f22

File tree

+11

-14

lines changed

+11

-14

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.13 1996/12/26 22:06:59 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.14 1997/01/14 08:04:42 bryanh Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -184,7 +184,6 @@ static struct typmap Ap = (struct typmap )NULL;`
`184`	`184`	`staticintWarnings=0;`
`185`	`185`	`staticcharBlanks[MAXATTR];`
`186`	`186`
`187`		`-Relationreldesc;/* current relation descriptor */`
`188`	`187`	`staticcharrelname;/ current relation name */`
`189`	`188`
`190`	`189`	`AttributeTupleFormattrtypes[MAXATTR];/* points to attribute info */`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.30 1996/12/26 22:07:17 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.31 1997/01/14 08:05:19 bryanh Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -119,11 +119,6 @@ static short ActiveBackends = FALSE;`
`119`	`119`	`staticintNextBackendId=MAXINT;/* XXX why? */`
`120`	`120`	`staticcharprogname= (char)NULL;`
`121`	`121`
`122`		`-char*DataDir;`
`123`		`-/* The PGDATA directory user says to use, or defaults to via environment`
`124`		`- variable. NULL if no option given and no environment variable set`
`125`		`- */`
`126`		`-`
`127`	`122`	`/*`
`128`	`123`	`* Default Values`
`129`	`124`	`*/`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.24 1996/12/26 22:07:40 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.25 1997/01/14 08:05:26 bryanh Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* this is the "main" module of the postgres backend and`
`@@ -100,7 +100,6 @@ int dontExecute = 0;`
`100`	`100`	`staticintShowStats;`
`101`	`101`	`staticboolIsEmptyQuery= false;`
`102`	`102`
`103`		`-Relationreldesc;/* current relation descritor */`
`104`	`103`	`charrelname[80];/* current relation name */`
`105`	`104`
`106`	`105`	`#if defined(WIN32)\|\| defined(next)`
`@@ -1272,7 +1271,7 @@ PostgresMain(int argc, char *argv[])`
`1272`	`1271`	`*/`
`1273`	`1272`	`if (IsUnderPostmaster== false) {`
`1274`	`1273`	`puts("\nPOSTGRES backend interactive interface");`
`1275`		`-puts("$Revision: 1.24 $ $Date:1996/12/26 22:07:40 $");`
	`1274`	`+puts("$Revision: 1.25 $ $Date:1997/01/14 08:05:26 $");`
`1276`	`1275`	`}`
`1277`	`1276`
`1278`	`1277`	`/* ----------------`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.3 1996/11/1410:24:38 bryanh Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.4 1997/01/1408:05:36 bryanh Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Globals used all over the place should be declared here and not`
`@@ -41,8 +41,12 @@ intNoversion = 0;`
`41`	`41`	`intQuiet=1;`
`42`	`42`
`43`	`43`	`intMasterPid;`
`44`		`-char*DataDir;`
`45`		`-`
	`44`	`+char*DataDir;`
	`45`	`+/* The PGDATA directory user says to use, or defaults to via environment`
	`46`	`+ variable. NULL if no option given and no environment variable set`
	`47`	`+ */`
	`48`	`+Relationreldesc;/* current relation descriptor */`
	`49`	`+`
`46`	`50`	`charOutputFileName[MAXPGPATH]="";`
`47`	`51`
`48`	`52`	`BackendIdMyBackendId;`

Comments

(0)