mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

#undef const, inline, signed, volatile, on the expectation that a C++

Browse Source 
compiler will understand them.  configure may have #define'd them to
empty because the local C compiler doesn't understand them, but this
may very well cause a C++ compilation to fail, so don't do it in C++.
This commit is contained in:
Tom Lane 2000-04-14 01:00:16 +00:00
parent 07672d4e0a
commit 87ca3bd294
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/libpq++/libpq++.h
View File

@ -13,7 +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 $
* $Id: libpq++.h,v 1.8 2000/04/14 01:00:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -25,6 +25,14 @@ extern "C" {
#include "config.h"
}
/* We assume that the C++ compiler will have these keywords, even though
* config.h may have #define'd them to empty because C compiler doesn't.
*/
#undef const
#undef inline
#undef signed
#undef volatile
#ifdef HAVE_CXX_STRING_HEADER
#include <string>
#endif

10
src/interfaces/libpq++/pgconnection.h
View File

@ -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.5 2000/03/30 05:30:42 tgl Exp $
* $Id: pgconnection.h,v 1.6 2000/04/14 01:00:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -25,6 +25,14 @@ extern "C" {
#include "config.h"
}
/* We assume that the C++ compiler will have these keywords, even though
* config.h may have #define'd them to empty because C compiler doesn't.
*/
#undef const
#undef inline
#undef signed
#undef volatile
#ifdef HAVE_CXX_STRING_HEADER
#include <string>
#endif