[SCM] OCE packaging branch, debian, updated. debian/0.11-1

salajkav-dlubalcz vojtech.salajka at dlubal.cz
Thu Dec 13 19:16:28 UTC 2012


The following commit has been merged in the debian branch:
commit 119d575b5b78b7b57196755cd50ae581ef03a191
Author: salajkav-dlubalcz <vojtech.salajka at dlubal.cz>
Date:   Wed Sep 12 11:22:32 2012 +0200

    Source code simplification.

diff --git a/inc/Standard_Atomic.hxx b/inc/Standard_Atomic.hxx
index 964b3b7..9f62cc9 100644
--- a/inc/Standard_Atomic.hxx
+++ b/inc/Standard_Atomic.hxx
@@ -34,26 +34,23 @@
 
 #include <Standard_Macro.hxx>
 
-#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);
- }
- #define _InterlockedIncrement InterlockedIncrement
- #define _InterlockedDecrement InterlockedDecrement
-#elif defined(_MSC_VER)
- extern "C" {
-  long _InterlockedIncrement(long volatile* lpAddend);
-  long _InterlockedDecrement(long volatile* lpAddend);
- }
-#endif
-#endif
-
-#if defined(_MSC_VER)
-  // force intrinsic instead of WinAPI calls
-  #pragma intrinsic (_InterlockedIncrement)
-  #pragma intrinsic (_InterlockedDecrement)
+#if (defined(_WIN32) || defined(__WIN32__))
+  #ifdef _MSC_VER
+    extern "C" {
+	  long _InterlockedIncrement(long volatile* lpAddend);
+      long _InterlockedDecrement(long volatile* lpAddend);
+    }
+    // force intrinsic instead of WinAPI calls
+    #pragma intrinsic (_InterlockedIncrement)
+    #pragma intrinsic (_InterlockedDecrement)
+  #else
+    extern "C" {
+      __declspec(dllimport) long __stdcall InterlockedIncrement ( long volatile *lpAddend);
+      __declspec(dllimport) long __stdcall InterlockedDecrement ( long volatile *lpAddend);
+    }
+    #define _InterlockedIncrement InterlockedIncrement
+    #define _InterlockedDecrement InterlockedDecrement
+  #endif
 #endif
 
 //! Increments atomically integer variable pointed by theValue

-- 
OCE packaging



More information about the debian-science-commits mailing list