[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - include/sal

[Stephan Bergmann]

 include/sal/config.h |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit c52c20a9fbb9a1a75e57ac0ca08d057f4266e12c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 16 11:29:21 2015 +0100

    Revert "never wonder if sun is not sun"
    
    This reverts commit 06a5b619a76c96783ee67bdcfd21f203d3ddb53c, which broke
    Solaris/Illumos builds for no good reason, cf. mail thread starting at
    <http://lists.freedesktop.org/archives/libreoffice/2015-January/065844.html>
    "4.4.0.1 build error on sal/types.h on solaris/illumos."
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Conflicts:
    	include/sal/config.h
    
    Change-Id: I063453ee1115ae3f97e2835828800c74e3cb5e48
    (cherry picked from commit 234e45bf1d27484b72e73fe327b1e92fda1933f1)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/sal/config.h b/include/sal/config.h
index 93a4898..c459365 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -86,6 +86,11 @@
 #define SAL_CONFIGFILE( name ) name "rc"
 #endif
 
+#ifdef sun
+#undef sun
+#define sun sun
+#endif
+
 #if defined __clang__
 #if __has_warning("-Wpotentially-evaluated-expression")
 #pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression"
commit 136014b52eeed89c562c2ab7a6fd9fd2d0fbe963
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 6 22:17:02 2015 +0100

    Silence unhelpful -Wpotentially-evaluated-expression
    
    ...on Clang trunk towards 3.6, firing for typeid(*e) where e is a side-effecting
    expression (of polymorphic pointer type).  Simpler to disable it via #if in
    sal/config.h than to disable it in solenv/gbuild/platform/com_GCC_defs.mk with
    an additional feature test in configure.ac.
    
    Change-Id: If94692a9e06ff2659bf168b4968200aeee9ebb0a
    (cherry picked from commit d1a74c273d10e6ab228acac2b8ebc151362a41b3)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/sal/config.h b/include/sal/config.h
index edac79d..93a4898 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -86,6 +86,12 @@
 #define SAL_CONFIGFILE( name ) name "rc"
 #endif
 
+#if defined __clang__
+#if __has_warning("-Wpotentially-evaluated-expression")
+#pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression"
+#endif
+#endif
+
 #endif // INCLUDED_SAL_CONFIG_H