diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-30 18:53:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-30 19:05:35 +0300 |
| commit | 469f8f4980d63e3580709d3e08f324cec5722b12 (patch) | |
| tree | 08dd877e38b3ef5d0c5cbd1f720883e52001e1b3 /sal/osl | |
| parent | a466ed042081f157418b3d0e525a97f147346ec0 (diff) | |
Work around compilation errors with MinGW and --enable-debug
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/w32/module.cxx | 6 | ||||
| -rw-r--r-- | sal/osl/w32/system.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index 842d40159f0e..b9841ad1e4bd 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 163d8232a35a..3f5d973b4110 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> |