summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-22 16:02:44 +0200
committerobo <obo@openoffice.org>2010-06-22 16:02:44 +0200
commit151c27ee2eee1651b1feed7bb5e767ddd2fe9a26 (patch)
tree7e2fba96891ce43c39c1e372a6bcb00583f9a6af
parentf32a2e368c3bb2d6955a4943944bb65df3ae8657 (diff)
parentf4afd8f3eaf885cfd3ab5de8f0e22ea14bdba9ae (diff)
CWS-TOOLING: integrate CWS mingwport30
-rw-r--r--sal/systools/win32/uwinapi/DllMain.cpp9
-rw-r--r--sal/systools/win32/uwinapi/sntprintf.c2
2 files changed, 5 insertions, 6 deletions
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp
index ff42ebf1f1dd..94f6c34fec24 100644
--- a/sal/systools/win32/uwinapi/DllMain.cpp
+++ b/sal/systools/win32/uwinapi/DllMain.cpp
@@ -223,14 +223,13 @@ extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )
{
case DLL_PROCESS_ATTACH:
UWINAPI_BaseAddress = hModule;
+#ifdef __MINGW32__
+ return TRUE;
+#else
return DisableThreadLibraryCalls( hModule );
+#endif
default:
return TRUE;
}
}
-
-
-
-
-
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 25e9c6df1f41..69d47821311c 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -10,7 +10,7 @@
#pragma warning(disable:4273) // inconsistent dll linkage
#endif
-#if _MSC_VER < 1300
+#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18))))
/* The non-debug versions of _vscprintf/_scprintf are just calls
to _vsprintf/_sprintf with string buffer pointer set to NULL,