Commit918b158

committed

Work around naming conflict between zlib and OpenSSL by tweaking inclusion

order. Remove some unnecessary #includes (that duplicate c.h).

1 parentde09790 commit918b158Copy full SHA for 918b158

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 2 additions & 1 deletion

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`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*`
`19`	`19`	`* IDENTIFICATION`
`20`		`- *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.54 2003/12/06 03:00:11 tgl Exp $`
	`20`	`+ *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.55 2003/12/08 16:39:05 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -27,13 +27,19 @@`
`27`	`27`
`28`	`28`	`#include"postgres_fe.h"`
`29`	`29`
`30`		`-#include<stdio.h>`
`31`	`30`	`#include<time.h>`
`32`		`-#include<errno.h>`
`33`	`31`
	`32`	`+#include"pg_backup.h"`
	`33`	`+`
	`34`	`+#include"libpq-fe.h"`
`34`	`35`	`#include"pqexpbuffer.h"`
	`36`	`+`
`35`	`37`	`#defineLOBBUFSIZE 32768`
`36`	`38`
	`39`	`+/*`
	`40`	`+ * Note: zlib.h must be included after libpq-fe.h, because the latter may`
	`41`	`+ * include ssl.h, which has a naming conflict with zlib.h.`
	`42`	`+ */`
`37`	`43`	`#ifdefHAVE_LIBZ`
`38`	`44`	`#include<zlib.h>`
`39`	`45`	`#defineGZCLOSE(fh) gzclose(fh)`
`@@ -55,9 +61,6 @@ typedef struct _z_stream`
`55`	`61`	`typedefz_stream*z_streamp;`
`56`	`62`	`#endif`
`57`	`63`
`58`		`-#include"pg_backup.h"`
`59`		`-#include"libpq-fe.h"`
`60`		`-`
`61`	`64`	`#defineK_VERS_MAJOR 1`
`62`	`65`	`#defineK_VERS_MINOR 8`
`63`	`66`	`#defineK_VERS_REV 0`

Lines changed: 1 addition & 3 deletions

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`	`staticsize_t_WriteData(ArchiveHandleAH,constvoiddata,size_tdLen);`

Lines changed: 1 addition & 3 deletions

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>`

Comments

(0)