[Libreoffice-commits] .: sal/inc sal/osl

[Libreoffice Gerrit user]

 sal/inc/osl/diagnose.hxx  |    6 ++----
 sal/osl/all/debugbase.cxx |    5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit a9966a47409a0149d936ba2a2650bc20cc52cce2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 12 15:18:58 2012 +0200

    WaE: C-linkage specified, but returns user-defined type
    
    Clang says: 'osl_detail_ObjectRegistry_getMutex' has C-linkage
    specified, but returns user-defined type '::osl::Mutex &' which is
    incompatible with C.
    
    Let's continue disabling that warning also also in 4.0 and later.
    
    Change-Id: I892bdc7e7aa6d546adf6b1c388e4c149db738948

diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 2c7e8c0..7ae1554 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -76,7 +76,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
 
 // These functions presumably should not be extern "C", but changing
 // that would break binary compatibility.
-#if SUPD < 400
 #ifdef __clang__
 #pragma clang diagnostic push
 // Guard against slightly older clang versions that don't have
@@ -84,14 +83,13 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
 #pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
-#endif
+
 SAL_DLLPUBLIC ::osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
     SAL_THROW_EXTERN_C();
-#if SUPD < 400
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#endif
 
 } // extern "C"
 
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 3b468fa..02e86b7 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -83,7 +83,6 @@ extern "C" {
 
 // These functions presumably should not be extern "C", but changing
 // that would break binary compatibility.
-#if SUPD < 400
 #ifdef __clang__
 #pragma clang diagnostic push
 // Guard against slightly older clang versions that don't have
@@ -91,17 +90,15 @@ extern "C" {
 #pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
-#endif
+
 osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
     SAL_THROW_EXTERN_C()
 {
     return DebugBaseMutex::get();
 }
-#if SUPD < 400
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#endif
 
 bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
     SAL_THROW_EXTERN_C()