Rename config.h to pg_config.h and os.h to pg_config_os.h, fix a number of

places that were including the wrong files.

diff --git a/bind.c b/bind.c
index 469edb6c2ce0498311359cd8555cba9cbb343401..2fc340907a3413abf60cb4d6b6df56f0d3edb160 100644 (file)
--- a/bind.c
+++ b/bind.c
@@ -13,11 +13,8 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "bind.h"
+
 #include "environ.h"
 #include "statement.h"
 #include "qresult.h"

diff --git a/columninfo.c b/columninfo.c
index 1c6359450749e98fe7f52485e5707de1a43c6b53..d9a22a163a111b8cb684850bf4dbfbc0182bc63d 100644 (file)
--- a/columninfo.c
+++ b/columninfo.c
@@ -13,6 +13,7 @@
  */
 
 #include "columninfo.h"
+
 #include "connection.h"
 #include "socket.h"
 #include <stdlib.h>

diff --git a/connection.c b/connection.c
index 54e448892bb9cbf1b8d9ad923efbbd94ac4284a4..3e6c89863ce1bfeed835b6b1405c72ec62b9ab8b 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -14,12 +14,9 @@
  */
 /* Multibyte support   Eiji Tokuya 2001-03-15 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "connection.h"
 
 #include "environ.h"
-#include "connection.h"
 #include "socket.h"
 #include "statement.h"
 #include "qresult.h"

diff --git a/connection.h b/connection.h
index 11379e4f2ff0882a29435378d02b140588d7b34c..4da6a7b7a8538ebe461041b3249f9cb306e8268d 100644 (file)
--- a/connection.h
+++ b/connection.h
@@ -9,15 +9,11 @@
 #ifndef __CONNECTION_H__
 #define __CONNECTION_H__
 
+#include "psqlodbc.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "psqlodbc.h"
-
 #ifndef WIN32
 #include "iodbc.h"
 #include "isql.h"

diff --git a/convert.c b/convert.c
index 12d5ddf1b8a48c559f0f50a333e2f3dbae662145..59dffbdcf9e062731cfd9926aa9cc303dfdf68ac 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -17,16 +17,12 @@
  */
 /* Multibyte support  Eiji Tokuya  2001-03-15  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "convert.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
-#include "psqlodbc.h"
-
 #ifdef MULTIBYTE
 #include "multibyte.h"
 #endif
@@ -44,7 +40,6 @@
 #include <time.h>
 #include <math.h>
 #include <stdlib.h>
-#include "convert.h"
 #include "statement.h"
 #include "qresult.h"
 #include "bind.h"

diff --git a/convert.h b/convert.h
index fed2239e3b14b14056a6493d5742022b57532158..4a142db3d5c16d9c4accbeb78d741f0cf97ccc78 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -11,6 +11,8 @@
 
 #include "psqlodbc.h"
 
+#include "isql.h"
+
 /* copy_and_convert results */
 #define COPY_OK                                    0
 #define COPY_UNSUPPORTED_TYPE                  1

diff --git a/dlg_specific.c b/dlg_specific.c
index c465f3fc280ed6f1b5e124587c6e34ed6e72c643..d28fcf966c43670baf38c0cfef3d6297c11f0f1d 100644 (file)
--- a/dlg_specific.c
+++ b/dlg_specific.c
@@ -17,9 +17,7 @@
  */
 /* Multibyte support   Eiji Tokuya 2001-03-15 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #ifndef WIN32
 #include <string.h>

diff --git a/dlg_specific.h b/dlg_specific.h
index 884fe2e85cecf27d2f1c26795b670c26d73a6606..67f99449754771cec22e58c8dcb3493cc3c06719 100644 (file)
--- a/dlg_specific.h
+++ b/dlg_specific.h
@@ -9,10 +9,6 @@
 #ifndef __DLG_SPECIFIC_H__
 #define __DLG_SPECIFIC_H__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #include "connection.h"
 

diff --git a/drvconn.c b/drvconn.c
index 6a8c563fafbc2f50b7dc3d54d6d01cd2f8b1a915..e224cbda5e713f225367d37c136477b63e79b047 100644 (file)
--- a/drvconn.c
+++ b/drvconn.c
@@ -12,14 +12,11 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "psqlodbc.h"
 #include "connection.h"
 
 #ifndef WIN32

diff --git a/environ.c b/environ.c
index 2ea5f28ef452ebda26e2b9cc81c88966a919cf1f..d21c0540cac8a36dd6a3945ce7a94d261b49db5c 100644 (file)
--- a/environ.c
+++ b/environ.c
@@ -14,6 +14,7 @@
  */
 
 #include "environ.h"
+
 #include "connection.h"
 #include "dlg_specific.h"
 #include "statement.h"

diff --git a/environ.h b/environ.h
index cc7950ae5ee138b4250c16def19780bc21e1821a..6d50fa6b48f89fe9dc97aeedb53e14c630189302 100644 (file)
--- a/environ.h
+++ b/environ.h
@@ -9,10 +9,6 @@
 #ifndef __ENVIRON_H__
 #define __ENVIRON_H__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 
 #ifndef WIN32

diff --git a/execute.c b/execute.c
index 38eabfea6eb1bbce2d5879cc86f7f2503a52f8ae..374d700193de400100c5652ade59fef2bc58b2b7 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -13,10 +13,6 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/gpps.c b/gpps.c
index 248f8e0fcd3e43bf5829559e968b809d3d5ad898..4b13fbe62e504825d9dbfdab66a14b3b9ad1e5b2 100644 (file)
--- a/gpps.c
+++ b/gpps.c
@@ -21,9 +21,7 @@
 
 #ifndef WIN32
 
-#if HAVE_CONFIG_H
-#include "config.h"                /* produced by configure */
-#endif
+#include "gpps.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -36,7 +34,6 @@
 #include <sys/types.h>
 #include <string.h>
 #include "misc.h"
-#include "gpps.h"
 #include "dlg_specific.h"
 
 #ifndef TRUE
@@ -286,7 +283,7 @@ WritePrivateProfileString(char *theSection,     /* section name */
 }
 
 
-#if 0
+#if NOT_USED
 /*
  * Ok. What the hell's the default behaviour for a null input buffer, and null
  * section name. For now if either are null I ignore the request, until
@@ -449,7 +446,7 @@ if (!keyFound)
    return aReturnLength > 0 ? aReturnLength - 1 : 0;
 }
 
-#endif
+#endif /* NOT_USED */
 
 
-#endif
+#endif /* not WIN32 */

diff --git a/gpps.h b/gpps.h
index 5bbe10374b2dd2bb9912dfbce6851e5b6dd43120..9dc9d64210a7b838e37d798bb2a154568e05b6bc 100644 (file)
--- a/gpps.h
+++ b/gpps.h
@@ -4,9 +4,7 @@
 #ifndef GPPS_H
 #define GPPS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #ifndef WIN32
 #include <sys/types.h>

diff --git a/info.c b/info.c
index 79854d6cd2ed8b6e496c01947907a6489e517004..1bc96ac888c61af3866e4b549d34caaa0e065478 100644 (file)
--- a/info.c
+++ b/info.c
@@ -16,13 +16,10 @@
  *--------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #include <string.h>
 #include <stdio.h>
-#include "psqlodbc.h"
 
 #ifndef WIN32
 #include "iodbc.h"

diff --git a/misc.c b/misc.c
index ae75320bb5376a95da173f1f8c03cd7caef4ed7f..1bfb877cbf7f318b0b3cd8d57b4f2dc3ee39b3cb 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -12,12 +12,12 @@
  *-------
  */
 
+#include "psqlodbc.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 
-#include "psqlodbc.h"
-
 #ifndef WIN32
 #if HAVE_PWD_H
 #include <pwd.h>
@@ -120,10 +120,6 @@ qlog(char *fmt,...)
 
 /* Undefine these because windows.h will redefine and cause a warning */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef WIN32
 #undef va_start
 #undef va_end

diff --git a/misc.h b/misc.h
index 5172e491f5df91133ba7f5301cf8dd3ecd21e15a..dc2ef0d5bea560f5bb3271539687c7ab8b1f0f00 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -9,9 +9,7 @@
 #ifndef __MISC_H__
 #define __MISC_H__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #ifndef WIN32
 #include "gpps.h"

diff --git a/multibyte.c b/multibyte.c
index 4d25c0bb1ad14d0608cac02b69c1ab6c54b1f86a..a9c9c2f83bb1c5d5a0c351e3d284feb16fe4ddcc 100644 (file)
--- a/multibyte.c
+++ b/multibyte.c
@@ -7,8 +7,8 @@
  *--------
  */
 
-#include <string.h>
 #include "multibyte.h"
+#include <string.h>
 
 int            multibyte_client_encoding;  /* Multibyte Client Encoding. */
 int            multibyte_status;   /* Multibyte Odds and ends character. */

diff --git a/multibyte.h b/multibyte.h
index c7d8b20d9519ffdb27c1c67b82fd8ad54c7396c0..43870458e0d7686b4bce04c7f641019a6cc79863 100644 (file)
--- a/multibyte.h
+++ b/multibyte.h
@@ -3,6 +3,7 @@
  * Multibyte library header ( psqlODBC Only )
  *
  */
+#include "psqlodbc.h"
 
 /* PostgreSQL client encoding */
 #define SQL_ASCII          0   /* SQL/ASCII */

diff --git a/odbcapi.c b/odbcapi.c
index a69c3d1a944449abfa12fe678a7a0e52871dc8dc..60205c011b6b81cb10c6f6424974052326166712 100644 (file)
--- a/odbcapi.c
+++ b/odbcapi.c
@@ -26,10 +26,6 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #ifdef WIN32
 #undef ODBCVER

diff --git a/odbcapi30.c b/odbcapi30.c
index 9902be746df09d139dd1ccc1791ffc0a07f61583..cee57934df2e8c2878e948042502b981dc31bf40 100644 (file)
--- a/odbcapi30.c
+++ b/odbcapi30.c
@@ -18,10 +18,6 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #undef ODBCVER
 #define ODBCVER 0x0300

diff --git a/options.c b/options.c
index 82b651cdc586b2dbd18c9381968bc5337c9ba7f3..77421b63ebda07758145db614332029a32b256c8 100644 (file)
--- a/options.c
+++ b/options.c
@@ -13,10 +13,6 @@
  *--------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #include <string.h>
 

diff --git a/parse.c b/parse.c
index 8916db2072d65cfcf047f61c93971c314f440670..eb0589e4c4b241eb4991f7d45cd7ad6c1b13972a 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -22,9 +22,7 @@
  */
 /* Multibyte support   Eiji Tokuya 2001-03-15 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #include <stdio.h>
 #include <string.h>

diff --git a/pgapifunc.h b/pgapifunc.h
index fda018f61f993413f64daa1f053ecd6de1f20d7a..a4aca5f323d4d129de58caf53e978400c14fcf0c 100644 (file)
--- a/pgapifunc.h
+++ b/pgapifunc.h
@@ -5,9 +5,6 @@
  */
 #ifndef    _PG_API_FUNC_H__
 #define    _PG_API_FUNC_H__
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "psqlodbc.h"
 #include <stdio.h>

diff --git a/pgtypes.c b/pgtypes.c
index ff640776f8b461a270e96dd4649d0c03007ba2ae..fdc38d62a19f2c74551482d101d82f2f5f2e18c0 100644 (file)
--- a/pgtypes.c
+++ b/pgtypes.c
@@ -16,13 +16,9 @@
  *--------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "pgtypes.h"
 
-#include "psqlodbc.h"
 #include "dlg_specific.h"
-#include "pgtypes.h"
 #include "statement.h"
 #include "connection.h"
 #include "qresult.h"

diff --git a/psqlodbc.c b/psqlodbc.c
index 4eabeae5ff33bc9beb7c0e6541d5090c41056655..9851af2ee66e237c8258efc24e33817ccd03c823 100644 (file)
--- a/psqlodbc.c
+++ b/psqlodbc.c
@@ -13,10 +13,6 @@
  *--------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #include "dlg_specific.h"
 

diff --git a/psqlodbc.h b/psqlodbc.h
index df0771065123150010669eafefd6d91d75384df9..542fe7ff596ac57056b3a86caad4eb3aec2ac661 100644 (file)
--- a/psqlodbc.h
+++ b/psqlodbc.h
@@ -5,7 +5,7 @@
  *
  * Comments:       See "notice.txt" for copyright and license information.
  *
- * $Id: psqlodbc.h,v 1.45 2001/08/18 04:30:47 inoue Exp $
+ * $Id: psqlodbc.h,v 1.46 2001/08/24 14:07:50 petere Exp $
  *
  */
 
@@ -13,7 +13,7 @@
 #define __PSQLODBC_H__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "pg_config.h"
 #endif
 
 #include <stdio.h>             /* for FILE* pointers: see GLOBAL_VALUES */

diff --git a/qresult.h b/qresult.h
index 7da2a0201ec80e1e6fe06188f9119f488436bda3..29e171bad80a61ac2dbc18de3c222c534382f153 100644 (file)
--- a/qresult.h
+++ b/qresult.h
@@ -9,11 +9,12 @@
 #ifndef __QRESULT_H__
 #define __QRESULT_H__
 
+#include "psqlodbc.h"
+
 #include "connection.h"
 #include "socket.h"
 #include "columninfo.h"
 #include "tuplelist.h"
-#include "psqlodbc.h"
 #include "tuple.h"
 
 enum QueryResultCode_

diff --git a/results.c b/results.c
index 098c5581d621f0ead0216f08919be8ce4853fc94..bb1f2975df6ec4593103160b7dd7cdc8271d7ed5 100644 (file)
--- a/results.c
+++ b/results.c
@@ -15,12 +15,9 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #include <string.h>
-#include "psqlodbc.h"
 #include "dlg_specific.h"
 #include "environ.h"
 #include "connection.h"

diff --git a/socket.c b/socket.c
index 243df4a50140a4e4a5c3bab604b3e885651f8cd6..ed3fd2913c6b0e58eb0cb6645a9478fcd43c72c6 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -12,10 +12,6 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "socket.h"
 
 #ifndef WIN32

diff --git a/socket.h b/socket.h
index b4a55e57db64c2666c8a1fce35c39fa75510be4e..b24be9504d45e37b1196cffc33b14057ab79a010 100644 (file)
--- a/socket.h
+++ b/socket.h
@@ -9,9 +9,7 @@
 #ifndef __SOCKET_H__
 #define __SOCKET_H__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "psqlodbc.h"
 
 #ifndef WIN32
 #include <sys/types.h>

diff --git a/statement.c b/statement.c
index 3ab683d4a04e783c36a3736650dbe9a4f2185bc0..891f47df8312f7216db563d2cac101094644e796 100644 (file)
--- a/statement.c
+++ b/statement.c
@@ -12,10 +12,6 @@
  *-------
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "statement.h"
 #include "bind.h"
 #include "connection.h"

diff --git a/statement.h b/statement.h
index 6250a934a5aa69d882fe5af59801b9e805450ca0..571d13edaca8dc3849fbe2ebb493a801603338ea 100644 (file)
--- a/statement.h
+++ b/statement.h
@@ -9,10 +9,6 @@
 #ifndef __STATEMENT_H__
 #define __STATEMENT_H__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "psqlodbc.h"
 #include "bind.h"
 

diff --git a/tuplelist.c b/tuplelist.c
index 06fd2d44ff813c4f842164900188213b28594fd9..284ee8ed440002d287aa8a0aca3eecf769a10df9 100644 (file)
--- a/tuplelist.c
+++ b/tuplelist.c
@@ -13,8 +13,8 @@
  *--------
  */
 
-#include <stdlib.h>
 #include "tuplelist.h"
+#include <stdlib.h>
 #include "tuple.h"