Work around naming conflict between zlib and OpenSSL by tweaking inclusion

tglsfdc · tglsfdc · commit 918b158743ad · 2003-12-08T16:39:05.000Z
order.  Remove some unnecessary #includes (that duplicate c.h).
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -11,14 +11,15 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.79 2003/12/07 03:14:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.80 2003/12/08 16:39:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres_fe.h"
 #include "pg_dump.h"
 #include "pg_backup_archiver.h"
+
 #include "postgres.h"
 #include "catalog/pg_class.h"
 
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
@@ -17,7 +17,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.54 2003/12/06 03:00:11 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.55 2003/12/08 16:39:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,13 +27,19 @@
 
 #include "postgres_fe.h"
 
-#include <stdio.h>
 #include <time.h>
-#include <errno.h>
 
+#include "pg_backup.h"
+
+#include "libpq-fe.h"
 #include "pqexpbuffer.h"
+
 #define LOBBUFSIZE 32768
 
+/*
+ * Note: zlib.h must be included *after* libpq-fe.h, because the latter may
+ * include ssl.h, which has a naming conflict with zlib.h.
+ */
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #define GZCLOSE(fh) gzclose(fh)
@@ -55,9 +61,6 @@ typedef struct _z_stream
 typedef z_stream *z_streamp;
 #endif
 
-#include "pg_backup.h"
-#include "libpq-fe.h"
-
 #define K_VERS_MAJOR 1
 #define K_VERS_MINOR 8
 #define K_VERS_REV 0
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
@@ -17,16 +17,14 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_null.c,v 1.13 2003/12/06 03:00:11 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_null.c,v 1.14 2003/12/08 16:39:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "pg_backup.h"
 #include "pg_backup_archiver.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>				/* for dup */
 
 static size_t _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.40 2003/12/06 03:00:11 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.41 2003/12/08 16:39:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,6 @@
 #include "pg_backup_archiver.h"
 #include "pg_backup_tar.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include <unistd.h>

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,15 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.79 2003/12/07 03:14:01 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.80 2003/12/08 16:39:05 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "postgres_fe.h"`
`20`	`20`	`#include "pg_dump.h"`
`21`	`21`	`#include "pg_backup_archiver.h"`
	`22`	`+`
`22`	`23`	`#include "postgres.h"`
`23`	`24`	`#include "catalog/pg_class.h"`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,14 @@`
`17`	`17`	`*`
`18`	`18`	`*`
`19`	`19`	`* IDENTIFICATION`
`20`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_null.c,v 1.13 2003/12/06 03:00:11 tgl Exp $`
	`20`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_null.c,v 1.14 2003/12/08 16:39:05 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`24`	`24`
`25`	`25`	`#include "pg_backup.h"`
`26`	`26`	`#include "pg_backup_archiver.h"`
`27`	`27`
`28`		`-#include <stdlib.h>`
`29`		`-#include <string.h>`
`30`	`28`	`#include <unistd.h> /* for dup */`
`31`	`29`
`32`	`30`	`static size_t _WriteData(ArchiveHandle AH, const void data, size_t dLen);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*`
`18`	`18`	`* IDENTIFICATION`
`19`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.40 2003/12/06 03:00:11 tgl Exp $`
	`19`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.41 2003/12/08 16:39:05 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -25,8 +25,6 @@`
`25`	`25`	`#include "pg_backup_archiver.h"`
`26`	`26`	`#include "pg_backup_tar.h"`
`27`	`27`
`28`		`-#include <stdlib.h>`
`29`		`-#include <string.h>`
`30`	`28`	`#include <ctype.h>`
`31`	`29`	`#include <limits.h>`
`32`	`30`	`#include <unistd.h>`