mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-02-23 19:39:53 +08:00
Make use of configure symbols for unportable constructs. Make
inclusions of system headers more consistent.
This commit is contained in:
parent
67cee15367
commit
0a5a0b8dfd
@ -1,4 +1,3 @@
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* libpq++.h
|
||||
@ -14,6 +13,7 @@
|
||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: libpq++.h,v 1.7 2000/03/30 05:30:42 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -21,19 +21,23 @@
|
||||
#ifndef LIBPQXX_H
|
||||
#define LIBPQXX_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <strings.h>
|
||||
#include <string>
|
||||
|
||||
extern "C" {
|
||||
#include "config.h"
|
||||
}
|
||||
|
||||
#ifdef HAVE_CXX_STRING_HEADER
|
||||
#include <string>
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "postgres.h"
|
||||
#include "libpq-fe.h"
|
||||
}
|
||||
|
||||
static char rcsid[] = "$Id: libpq++.h,v 1.6 2000/03/02 02:00:58 momjian Exp $";
|
||||
|
||||
#ifdef HAVE_NAMESPACE_STD
|
||||
using namespace std;
|
||||
#endif
|
||||
|
||||
|
||||
// ****************************************************************
|
||||
//
|
||||
@ -194,5 +198,3 @@ public:
|
||||
#define BUFSIZE 1024
|
||||
|
||||
#endif /* LIBPQXX_H */
|
||||
|
||||
|
||||
|
@ -10,13 +10,11 @@
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.7 2000/03/16 15:34:36 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.8 2000/03/30 05:30:42 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "pgconnection.h"
|
||||
|
||||
extern "C" {
|
||||
|
@ -13,7 +13,7 @@
|
||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: pgconnection.h,v 1.4 2000/03/02 02:00:58 momjian Exp $
|
||||
* $Id: pgconnection.h,v 1.5 2000/03/30 05:30:42 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -21,14 +21,23 @@
|
||||
#ifndef PGCONN_H
|
||||
#define PGCONN_H
|
||||
|
||||
#include <stdio.h>
|
||||
extern "C" {
|
||||
#include "config.h"
|
||||
}
|
||||
|
||||
#ifdef HAVE_CXX_STRING_HEADER
|
||||
#include <string>
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "postgres.h"
|
||||
#include "libpq-fe.h"
|
||||
}
|
||||
|
||||
#ifdef HAVE_NAMESPACE_STD
|
||||
using namespace std;
|
||||
#endif
|
||||
|
||||
|
||||
// ****************************************************************
|
||||
//
|
||||
|
@ -14,7 +14,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
*
|
||||
* $Id: pgdatabase.h,v 1.6 2000/01/26 05:58:48 momjian Exp $
|
||||
* $Id: pgdatabase.h,v 1.7 2000/03/30 05:30:42 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -24,7 +24,6 @@
|
||||
|
||||
#include "pgconnection.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
// ****************************************************************
|
||||
//
|
||||
|
Loading…
Reference in New Issue
Block a user