summaryrefslogtreecommitdiff
path: root/loadlib.c
diff options
context:
space:
mode:
authorHiroshi Inoue2007-06-02 05:32:19 +0000
committerHiroshi Inoue2007-06-02 05:32:19 +0000
commit92a075cb7c009ac5770973c87e0097e8c23aeaad (patch)
tree8483779a837e2ef3fc7442047974edc6cb195722 /loadlib.c
parentccbd87ed3e18456afafa6c3a4b4c8d829e2bb050 (diff)
The version is now 8.2.0402.
. Fix some bugs in case without MSDTC support. . Refine the realloc handling. . Put back the @@IDENTITY implementation so as not to use lastval(). . Change SQLColumns() to return correct column length in the Unicode driver. . Remove the connection count limitation. . Fix Protocol=7.4--1 notation (should be Protocol=7.4). . Fix a typo in socket.c (bug report from Rainer bauer).
Diffstat (limited to 'loadlib.c')
-rw-r--r--loadlib.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/loadlib.c b/loadlib.c
index 87cde2d..0dbfd85 100644
--- a/loadlib.c
+++ b/loadlib.c
@@ -23,11 +23,13 @@
#pragma comment(lib, "Delayimp")
#pragma comment(lib, "libpq")
#pragma comment(lib, "ssleay32")
+#ifdef _HANDLE_ENLIST_IN_DTC_
#ifdef UNICODE_SUPPORT
#pragma comment(lib, "pgenlist")
#else
#pragma comment(lib, "pgenlista")
#endif /* UNICODE_SUPPORT */
+#endif /* _HANDLE_ENLIST_IN_DTC_ */
// 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
@@ -77,7 +79,7 @@ static HMODULE MODULE_load_from_psqlodbc_path(const char *module_name)
_splitpath(szFileName, drive, dir, NULL, NULL);
GetSystemDirectory(sysdir, MAX_PATH);
snprintf(szFileName, sizeof(szFileName), "%s%s%s.dll", drive, dir, module_name);
- if (strnicmp(szFileName, sysdir, strlen(sysdir)) != 0)
+ if (_strnicmp(szFileName, sysdir, strlen(sysdir)) != 0)
{
hmodule = LoadLibraryEx(szFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
mylog("psqlodbc path based %s loaded module=%p\n", module_name, hmodule);
@@ -117,12 +119,12 @@ DliErrorHook(unsigned dliNotify,
#else
__pfnDliNotifyHook2 = NULL;
#endif /* _MSC_VER */
- if (strnicmp(pdli->szDll, libpq, 5) == 0)
+ if (_strnicmp(pdli->szDll, libpq, 5) == 0)
{
if (hmodule = MODULE_load_from_psqlodbc_path(libpq), NULL == hmodule)
hmodule = LoadLibrary(libpq);
}
- else if (strnicmp(pdli->szDll, pgenlist, strlen(pgenlist)) == 0)
+ else if (_strnicmp(pdli->szDll, pgenlist, strlen(pgenlist)) == 0)
{
if (hmodule = MODULE_load_from_psqlodbc_path(pgenlist), NULL == hmodule)
hmodule = LoadLibrary(pgenlist);