diff options
| author | Hiroshi Inoue | 2007-10-27 01:14:00 +0000 |
|---|---|---|
| committer | Hiroshi Inoue | 2007-10-27 01:14:00 +0000 |
| commit | fc4df26bb85ab91e6d3a47dbd002f96290ac258c (patch) | |
| tree | 139157356e99ad6fb305e6c71caf07a04a6f6ff6 /loadlib.c | |
| parent | be8dd244ed3fab63dd34a22ef58cc02fa417df0f (diff) | |
The version is now 8.2.0501.
1. Correct the COLUMN_LENGTH return value of SQLColumns() for varchar/bpchar
type columns (Unicode driver).
2. Change to not return database name if case of MS Query.
3. The first cut to use Windows SSPI. The trial to use Schannel service
for SSL support.
4. Be more careful about <for locking clause> in UseDeclareFetch mode.
Add missing? "for read only" clause for read only queries for 8.3
or later servers for safety.
Diffstat (limited to 'loadlib.c')
| -rw-r--r-- | loadlib.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -14,15 +14,19 @@ #ifndef WIN32 #include <errno.h> #endif /* WIN32 */ +#ifndef NOT_USE_LIBPQ #include <libpq-fe.h> +#endif /* NOT_USE_LIBPQ */ #include "loadlib.h" #include "pgenlist.h" #ifdef WIN32 #ifdef _MSC_VER #pragma comment(lib, "Delayimp") +#ifndef NOT_USE_LIBPQ #pragma comment(lib, "libpq") #pragma comment(lib, "ssleay32") +#endif /* NOT_USE_LIBPQ */ #ifdef _HANDLE_ENLIST_IN_DTC_ #ifdef UNICODE_SUPPORT #pragma comment(lib, "pgenlist") @@ -33,8 +37,10 @@ // The followings works under VC++6.0 but doesn't work under VC++7.0. // Please add the equivalent linker options using command line etc. #if (_MSC_VER == 1200) && defined(DYNAMIC_LOAD) // VC6.0 +#ifndef NOT_USE_LIBPQ #pragma comment(linker, "/Delayload:libpq.dll") #pragma comment(linker, "/Delayload:ssleay32.dll") +#endif /* NOT_USE_LIBPQ */ #ifdef UNICODE_SUPPORT #pragma comment(linker, "/Delayload:pgenlist.dll") #else @@ -187,6 +193,7 @@ void CleanupDelayLoadedDLLs(void) } #endif /* _MSC_DELAY_LOAD_IMPORT */ +#ifndef NOT_USE_LIBPQ void *CALL_PQconnectdb(const char *conninfo, BOOL *libpqLoaded) { void *pqconn = NULL; @@ -223,6 +230,7 @@ void *CALL_PQconnectdb(const char *conninfo, BOOL *libpqLoaded) #endif /* _MSC_DELAY_LOAD_IMPORT */ return pqconn; } +#endif /* NOT_USE_LIBPQ */ #ifdef _HANDLE_ENLIST_IN_DTC_ RETCODE CALL_EnlistInDtc(ConnectionClass *conn, void *pTra, int method) |