[SCM] OCE packaging branch, debian, updated. debian/0.11-1
salajkav-dlubalcz
vojtech.salajka at dlubal.cz
Thu Dec 13 19:16:27 UTC 2012
The following commit has been merged in the debian branch:
commit 1bfed73424019d8e17502623c94ea06bac4cbf7a
Author: salajkav-dlubalcz <vojtech.salajka at dlubal.cz>
Date: Wed Sep 12 09:48:31 2012 +0200
MinGW32 compatibility fixes.
diff --git a/inc/Standard_Atomic.hxx b/inc/Standard_Atomic.hxx
index 5bbc56c..964b3b7 100644
--- a/inc/Standard_Atomic.hxx
+++ b/inc/Standard_Atomic.hxx
@@ -34,8 +34,8 @@
#include <Standard_Macro.hxx>
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#ifdef __BORLANDC__
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
+#if defined(__BORLANDC__) || defined(__MINGW32__)
extern "C" {
__declspec(dllimport) long __stdcall InterlockedIncrement ( long volatile *lpAddend);
__declspec(dllimport) long __stdcall InterlockedDecrement ( long volatile *lpAddend);
diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
index d1850c6..b0fae0d 100644
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -22,6 +22,10 @@
#endif
#if (defined(_WIN32) || defined(__WIN32__))
+ #if defined(__MINGW32__)
+ #define WIN32_WINNT 0x0500
+ #define WINVER 0x0500
+ #endif
#include <windows.h>
#include <winbase.h>
#include <process.h>
--
OCE packaging
More information about the debian-science-commits
mailing list