[Libreoffice-commits] .: 2 commits - android/experimental sal/osl

[Lubos Lunak]

 android/experimental/eagles051387/.gitignore |    1 +
 sal/osl/all/debugbase.cxx                    |   16 ++++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit cf557a25da78bbacf435c9aaec53c3de89dae758
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 19 14:50:20 2012 +0200

    .gitignore

diff --git a/android/experimental/eagles051387/.gitignore b/android/experimental/eagles051387/.gitignore
new file mode 100644
index 0000000..cddd2a3
--- /dev/null
+++ b/android/experimental/eagles051387/.gitignore
@@ -0,0 +1 @@
+.classpath
commit 18f117ae6bde53f4427c777d7bbfca2cf6afdb04
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 19 14:47:09 2012 +0200

    clang warning for osl_detail_ObjectRegistry_getMutex() in the .cxx file too

diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 48a9c1a..9b3021f 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -81,11 +81,27 @@ struct DebugBaseMutex : ::rtl::Static<osl::Mutex, DebugBaseMutex> {};
 
 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
+// -Wreturn-type-c-linkage...
+#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()