diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-06-09 16:03:09 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-06-09 16:03:09 +0000 |
| commit | 3fe3acb844995e44ac0eba9d06dc70061e769145 (patch) | |
| tree | 62b57d95736340c1ded1b7f25785d9ee47c4f951 /src | |
| parent | 85add42a570cdb4be2d674e62535eb54b4dcd5cf (diff) | |
| download | postgresql-3fe3acb844995e44ac0eba9d06dc70061e769145.tar.gz postgresql-3fe3acb844995e44ac0eba9d06dc70061e769145.zip | |
I have made the couple of mods required to make the odbc driver with
postgres build and use unixODBC (http://www.unixodbc.org)
This patch was applied against the postgresql-7.0beta1 build
Any problems let me know.
Nick Gorham
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/config.h.in | 5 | ||||
| -rw-r--r-- | src/interfaces/odbc/dlg_specific.c | 2 | ||||
| -rw-r--r-- | src/interfaces/odbc/misc.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/include/config.h.in b/src/include/config.h.in index 4b6e58cf8a3..0d913101904 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -8,7 +8,7 @@ * or in config.h afterwards. Of course, if you edit config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: config.h.in,v 1.116 2000/06/04 15:06:32 petere Exp $ + * $Id: config.h.in,v 1.117 2000/06/09 16:03:07 momjian Exp $ */ #ifndef CONFIG_H @@ -305,6 +305,9 @@ * Block of parameters for the ODBC code. */ +/* are we building against a libodbcinst */ +#undef HAVE_SQLGETPRIVATEPROFILESTRING + /* Set to 1 if you have <pwd.h> */ #undef HAVE_PWD_H diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index a6836563812..ebe16c1c6e3 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -23,8 +23,10 @@ #ifndef WIN32 #include <string.h> #include "gpps.h" +#ifndef HAVE_SQLGETPRIVATEPROFILESTRING #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) #define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d) +#endif #ifndef HAVE_STRICMP #define stricmp(s1,s2) strcasecmp(s1,s2) #define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index ebe56ea9d80..700e951e917 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -15,9 +15,10 @@ #endif #ifndef WIN32 -#include "gpps.h" +#ifndef HAVE_SQLGETPRIVATEPROFILESTRING #define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) #endif +#endif #include <stdio.h> |