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

[Denis Barbier]

The following commit has been merged in the debian branch:
commit 907cea25e7b538e9ee1fc084f3e25bbab032b619
Author: Denis Barbier <bouzim at gmail.com>
Date:   Fri Sep 28 09:00:01 2012 +0200

    Cosmetics: rearrange Standard_Atomic.hxx to minimize diff against OCCT
    
    Remove trailing whitespace in OSD_MemInfo.cxx.

diff --git a/inc/Standard_Atomic.hxx b/inc/Standard_Atomic.hxx
index 2dd646a..29a71cc 100644
--- a/inc/Standard_Atomic.hxx
+++ b/inc/Standard_Atomic.hxx
@@ -40,9 +40,6 @@
       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);
@@ -53,6 +50,12 @@
   #endif
 #endif
 
+#if defined(_MSC_VER)
+  // force intrinsic instead of WinAPI calls
+  #pragma intrinsic (_InterlockedIncrement)
+  #pragma intrinsic (_InterlockedDecrement)
+#endif
+
 //! Increments atomically integer variable pointed by theValue
 //! and returns resulting incremented value.
 static int Standard_Atomic_Increment (volatile int* theValue)
diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
index b0fae0d..e424cda 100644
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -24,8 +24,8 @@
 #if (defined(_WIN32) || defined(__WIN32__))
   #if defined(__MINGW32__)
     #define WIN32_WINNT 0x0500
-    #define WINVER 0x0500 
-  #endif  
+    #define WINVER 0x0500
+  #endif
   #include <windows.h>
   #include <winbase.h>
   #include <process.h>

-- 
OCE packaging