Commit0a5a0b8

committed

Make use of configure symbols for unportable constructs. Make

inclusions of system headers more consistent.

1 parent67cee15 commit0a5a0b8Copy full SHA for 0a5a0b8

File tree

+23

-15

lines changed

+23

-15

lines changed

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/*-------------------------------------------------------------------------`
`3`	`2`	`*`
`4`	`3`	`* libpq++.h`
`@@ -14,26 +13,31 @@`
`14`	`13`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`15`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`16`	`15`	`*`
	`16`	`+ * $Id: libpq++.h,v 1.7 2000/03/30 05:30:42 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`#ifndef LIBPQXX_H`
`22`	`22`	`#defineLIBPQXX_H`
`23`	`23`
`24`		`-#include<stdio.h>`
`25`		`-#include<strings.h>`
	`24`	`+extern"C" {`
	`25`	`+#include"config.h"`
	`26`	`+}`
	`27`	`+`
	`28`	`+#ifdef HAVE_CXX_STRING_HEADER`
`26`	`29`	`#include<string>`
	`30`	`+#endif`
`27`	`31`
`28`	`32`	`extern"C" {`
`29`		`-#include"config.h"`
`30`	`33`	`#include"postgres.h"`
`31`	`34`	`#include"libpq-fe.h"`
`32`	`35`	`}`
`33`	`36`
`34`		`-staticchar rcsid[] ="$Id: libpq++.h,v 1.6 2000/03/02 02:00:58 momjian Exp $";`
`35`		`-`
	`37`	`+#ifdef HAVE_NAMESPACE_STD`
`36`	`38`	`usingnamespacestd;`
	`39`	`+#endif`
	`40`	`+`
`37`	`41`
`38`	`42`	`// ****************************************************************`
`39`	`43`	`//`
`@@ -194,5 +198,3 @@ class PgCursor : public PgTransaction {`
`194`	`198`	`#defineBUFSIZE1024`
`195`	`199`
`196`	`200`	`#endif/* LIBPQXX_H*/`
`197`		`-`
`198`		`-`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,11 @@`
`10`	`10`	`* Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.7 2000/03/16 15:34:36 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.8 2000/03/30 05:30:42 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include<stdlib.h>`
`19`		`-#include<string.h>`
`20`	`18`	`#include"pgconnection.h"`
`21`	`19`
`22`	`20`	`extern"C" {`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,22 +13,31 @@`
`13`	`13`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`14`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`		`- * $Id: pgconnection.h,v 1.4 2000/03/02 02:00:58 momjian Exp $`
	`16`	`+ * $Id: pgconnection.h,v 1.5 2000/03/30 05:30:42 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`#ifndef PGCONN_H`
`22`	`22`	`#definePGCONN_H`
`23`	`23`
`24`		`-#include<stdio.h>`
	`24`	`+extern"C" {`
	`25`	`+#include"config.h"`
	`26`	`+}`
	`27`	`+`
	`28`	`+#ifdef HAVE_CXX_STRING_HEADER`
`25`	`29`	`#include<string>`
	`30`	`+#endif`
`26`	`31`
`27`	`32`	`extern"C" {`
	`33`	`+#include"postgres.h"`
`28`	`34`	`#include"libpq-fe.h"`
`29`	`35`	`}`
`30`	`36`
	`37`	`+#ifdef HAVE_NAMESPACE_STD`
`31`	`38`	`usingnamespacestd;`
	`39`	`+#endif`
	`40`	`+`
`32`	`41`
`33`	`42`	`// ****************************************************************`
`34`	`43`	`//`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`	`16`	`*`
`17`		`- * $Id: pgdatabase.h,v 1.6 2000/01/26 05:58:48 momjian Exp $`
	`17`	`+ * $Id: pgdatabase.h,v 1.7 2000/03/30 05:30:42 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -24,7 +24,6 @@`
`24`	`24`
`25`	`25`	`#include"pgconnection.h"`
`26`	`26`
`27`		`-#include<stdlib.h>`
`28`	`27`
`29`	`28`	`// ****************************************************************`
`30`	`29`	`//`

Comments

(0)