[Libreoffice-commits] .: sal/osl

[Tor Lillqvist]

 sal/osl/w32/module.cxx |    6 ------
 sal/osl/w32/system.h   |    8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 469f8f4980d63e3580709d3e08f324cec5722b12
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 30 18:53:52 2011 +0300

    Work around compilation errors with MinGW and --enable-debug

diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 842d401..b9841ad 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -26,13 +26,7 @@
 *
 ************************************************************************/
 
-#ifdef __MINGW32__
-extern "C" {
-#endif
 #include "system.h"
-#ifdef __MINGW32__
-}
-#endif
 #include <tlhelp32.h>
 
 #include "file_url.h"
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index 163d823..3f5d973 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -64,10 +64,14 @@
     // at the same time without patching
     // windows.h
     #include <windows.h>
-#ifdef __MINGW32__
     #include <winsock2.h>
+    #ifdef __cplusplus
+    extern "C" {
+    #endif
     #include <ws2tcpip.h>
-#endif
+    #ifdef __cplusplus
+    }
+    #endif
     #include <shlobj.h>
     #ifndef NO_DEBUG_CRT
         #include <crtdbg.h>