Libpq++ fixes for Win32 compile.

Christian Ullrich

diff --git a/src/include/c.h b/src/include/c.h
index 2b6a9e0d7f09a372528281ad0024179308f017aa..0457a4af5b7ca14f131bc3969882db1f6d66edf3 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.96 2001/07/03 20:21:50 petere Exp $
+ * $Id: c.h,v 1.97 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -615,7 +615,13 @@ typedef NameData *Name;
 #else                                                  /* not BUILDING_DLL */
 #define DLLIMPORT __declspec (dllimport)
 #endif
-#else                                                  /* not CYGWIN */
+#elif defined(WIN32) && defined(_MSC_VER)      /* not CYGWIN */
+#if defined(_DLL)
+#define DLLIMPORT __declspec (dllexport)
+#else                                                  /* not _DLL */
+#define DLLIMPORT __declspec (dllimport)
+#endif
+#else                                                  /* not CYGWIN, not MSVC */
 #define DLLIMPORT
 #endif
 

diff --git a/src/include/config.h.win32 b/src/include/config.h.win32
index de46dbf6cfc088ac344ab392e454260c3d7adfea..e8323b7736495cdbcc5e1f013d7460f943dfe916 100644 (file)
--- a/src/include/config.h.win32
+++ b/src/include/config.h.win32
@@ -20,3 +20,6 @@
 
 #define HAVE_ATEXIT
 #define HAVE_MEMMOVE
+
+#define HAVE_CXX_STRING_HEADER
+#define HAVE_NAMESPACE_STD

diff --git a/src/interfaces/libpq++/pgconnection.h b/src/interfaces/libpq++/pgconnection.h
index 76cb6ec3670ad45d5723465f0a8da3cedd490abb..379f8d023e7654c0a01cfa1914fbfda7aeed3968 100644 (file)
--- a/src/interfaces/libpq++/pgconnection.h
+++ b/src/interfaces/libpq++/pgconnection.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  * 
- * $Id: pgconnection.h,v 1.11 2001/05/09 17:29:10 momjian Exp $
+ * $Id: pgconnection.h,v 1.12 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@ extern "C" {
 // This class contains all the information about the connection
 // to the backend process.  All the database classes should be
 // derived from this class to obtain the connection interface.
-class PgConnection {
+class DLLIMPORT PgConnection {
 protected:
   PGconn* pgConn;                      // Connection Structure
   PGresult* pgResult;                  // Current Query Result

diff --git a/src/interfaces/libpq++/pgcursordb.h b/src/interfaces/libpq++/pgcursordb.h
index bbf8757ce4d9bc4fa48f770520e86f33679276dc..07a148f1dcb1e53f98cf5501d6e851976a95add9 100644 (file)
--- a/src/interfaces/libpq++/pgcursordb.h
+++ b/src/interfaces/libpq++/pgcursordb.h
@@ -14,7 +14,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- *  $Id: pgcursordb.h,v 1.7 2001/05/09 17:29:10 momjian Exp $
+ *  $Id: pgcursordb.h,v 1.8 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@
 // manipulates data through it.  The interface will introduce some
 // ease of use through the methods that will allow cursor specific
 // operations, like fetch, forward, etc.
-class PgCursor : public PgTransaction {
+class DLLIMPORT PgCursor : public PgTransaction {
 public:
   PgCursor(const char* conninfo, const char* cursor);  // use reasonable & environment defaults
   // connect to the database with given environment and database name

diff --git a/src/interfaces/libpq++/pgdatabase.h b/src/interfaces/libpq++/pgdatabase.h
index 2c502bd7847584b50a25167bedacc145128a9b78..5b2b8f40b73b1c7c67768f8a0817e01f3ddf4e70 100644 (file)
--- a/src/interfaces/libpq++/pgdatabase.h
+++ b/src/interfaces/libpq++/pgdatabase.h
@@ -14,7 +14,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- *  $Id: pgdatabase.h,v 1.11 2001/05/09 17:46:11 momjian Exp $
+ *  $Id: pgdatabase.h,v 1.12 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@
 // This is the basic database access class.  Its interface should 
 // be used only after a query has been sent to the backend and
 // results are being received.
-class PgDatabase : public PgConnection {
+class DLLIMPORT PgDatabase : public PgConnection {
 public:
   // connect to the database with conninfo
   explicit PgDatabase(const char* conninfo) : PgConnection(conninfo) {}

diff --git a/src/interfaces/libpq++/pglobject.h b/src/interfaces/libpq++/pglobject.h
index 493182e97b7b8e548d304b28147b7c62f17817cd..0f094d267611910dc96c734f3dd8c91833662bd7 100644 (file)
--- a/src/interfaces/libpq++/pglobject.h
+++ b/src/interfaces/libpq++/pglobject.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- *  $Id: pglobject.h,v 1.7 2001/05/09 17:29:10 momjian Exp $
+ *  $Id: pglobject.h,v 1.8 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@
 // PgLargeObject - a class for accessing Large Object in a database
 //
 // ****************************************************************
-class PgLargeObject : public PgConnection {
+class DLLIMPORT PgLargeObject : public PgConnection {
 private:
   int pgFd;
   Oid pgObject;

diff --git a/src/interfaces/libpq++/pgtransdb.h b/src/interfaces/libpq++/pgtransdb.h
index b0f645fd02a3e86dd06d3f0704b212aead04b35b..f322fa9a6d902de27499251c58c40d6898d2c699 100644 (file)
--- a/src/interfaces/libpq++/pgtransdb.h
+++ b/src/interfaces/libpq++/pgtransdb.h
@@ -14,7 +14,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- *  $Id: pgtransdb.h,v 1.7 2001/05/09 17:29:10 momjian Exp $
+ *  $Id: pgtransdb.h,v 1.8 2001/07/11 22:12:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@
 // This is the database access class that keeps an open
 // transaction block during its lifetime.  The block is ENDed when
 // the object is destroyed.
-class PgTransaction : public PgDatabase {
+class DLLIMPORT PgTransaction : public PgDatabase {
 public:
   explicit PgTransaction(const char* conninfo);        // use reasonable & environment defaults
   // connect to the database with given environment and database name

diff --git a/src/win32.mak b/src/win32.mak
index 86d9ee8216e1e3db39852bbf953c78ec0d0f3405..862b409d0bc57a0dde268d318e14cd582c77b49c 100644 (file)
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -20,6 +20,8 @@ ALL:
    cd ..
    cd interfaces\libpq
    nmake /f win32.mak $(MAKEMACRO)
+   cd ..\libpq++
+   nmake /f win32.mak $(MAKEMACRO)
    cd ..\..\bin\psql
    nmake /f win32.mak $(MAKEMACRO)
    cd ..\..