[Libreoffice-commits] core.git: sal/rtl

Stephan Bergmann sbergman at redhat.com
Tue Nov 10 02:40:37 PST 2015


 sal/rtl/alloc_cache.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a415a66f1af0944cac631bfd6b75c3d569e6f1df
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 10 11:40:13 2015 +0100

    Fix SAL_W32
    
    Change-Id: I60333e2b0f71c38aa13e6a6665c2a305e6dc08fa

diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 5490381..7bd5497 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -1522,7 +1522,11 @@ rtl_cache_wsupdate_all (void * arg)
     }
     RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
 
+#if defined(SAL_UNX)
     return nullptr;
+#elif defined(SAL_W32)
+    return 0;
+#endif
 }
 
 /* ================================================================= *


More information about the Libreoffice-commits mailing list