Fix HAVE_OPTRESET to be HAVE_INT_OPTRESET. Typos spotted by Lorne Sunley.

tglsfdc · tglsfdc · commit 90c3ebe4d7cf · 2004-11-27T18:51:08.000Z
diff --git a/contrib/pg_dumplo/main.c b/contrib/pg_dumplo/main.c
@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.20 2004/10/25 02:15:00 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.21 2004/11/27 18:51:04 tgl Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -23,7 +23,7 @@
 
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.67 2004/11/14 23:36:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.68 2004/11/27 18:51:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,7 @@
 #include "mb/pg_wchar.h"
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.47 2004/11/17 17:46:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.48 2004/11/27 18:51:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@
 #undef WIN32
 #endif
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.392 2004/11/06 19:36:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.393 2004/11/27 18:51:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,7 @@
 
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.54 2004/10/16 03:10:15 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.55 2004/11/27 18:51:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@
 
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.66 2004/11/11 17:06:46 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.67 2004/11/27 18:51:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@
 
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.105 2004/11/01 19:21:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.106 2004/11/27 18:51:07 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -18,7 +18,7 @@
 
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
@@ -4,7 +4,7 @@
 #include "pqexpbuffer.h"
 #include "getopt_long.h"
 
-#ifndef HAVE_OPTRESET
+#ifndef HAVE_INT_OPTRESET
 int			optreset;
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -------------------------------------------------------------------------`
`2`	`2`	`* pg_dumplo`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.20 2004/10/25 02:15:00 tgl Exp $`
	`4`	`+ * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.21 2004/11/27 18:51:04 tgl Exp $`
`5`	`5`	`*`
`6`	`6`	`* Karel Zak 1999-2000`
`7`	`7`	`* -------------------------------------------------------------------------`
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#include "getopt_long.h"`
`25`	`25`
`26`		`-#ifndef HAVE_OPTRESET`
	`26`	`+#ifndef HAVE_INT_OPTRESET`
`27`	`27`	`int optreset;`
`28`	`28`	`#endif`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.47 2004/11/17 17:46:12 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.48 2004/11/27 18:51:05 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -28,7 +28,7 @@`
`28`	`28`	`#undef WIN32`
`29`	`29`	`#endif`
`30`	`30`
`31`		`-#ifndef HAVE_OPTRESET`
	`31`	`+#ifndef HAVE_INT_OPTRESET`
`32`	`32`	`int optreset;`
`33`	`33`	`#endif`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* by PostgreSQL`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.392 2004/11/06 19:36:02 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.393 2004/11/27 18:51:06 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -40,7 +40,7 @@`
`40`	`40`
`41`	`41`	`#include "getopt_long.h"`
`42`	`42`
`43`		`-#ifndef HAVE_OPTRESET`
	`43`	`+#ifndef HAVE_INT_OPTRESET`
`44`	`44`	`int optreset;`
`45`	`45`	`#endif`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.54 2004/10/16 03:10:15 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.55 2004/11/27 18:51:06 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`#include "getopt_long.h"`
`27`	`27`
`28`		`-#ifndef HAVE_OPTRESET`
	`28`	`+#ifndef HAVE_INT_OPTRESET`
`29`	`29`	`int optreset;`
`30`	`30`	`#endif`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.66 2004/11/11 17:06:46 momjian Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.67 2004/11/27 18:51:06 tgl Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -57,7 +57,7 @@`
`57`	`57`
`58`	`58`	`#include "getopt_long.h"`
`59`	`59`
`60`		`-#ifndef HAVE_OPTRESET`
	`60`	`+#ifndef HAVE_INT_OPTRESET`
`61`	`61`	`int optreset;`
`62`	`62`	`#endif`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.105 2004/11/01 19:21:50 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.106 2004/11/27 18:51:07 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`#include "getopt_long.h"`
`20`	`20`
`21`		`-#ifndef HAVE_OPTRESET`
	`21`	`+#ifndef HAVE_INT_OPTRESET`
`22`	`22`	`int optreset;`
`23`	`23`	`#endif`
`24`	`24`