Kaydet (Commit) 234e45bf authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "never wonder if sun is not sun"

This reverts commit 06a5b619, 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."

Conflicts:
	include/sal/config.h

Change-Id: I063453ee1115ae3f97e2835828800c74e3cb5e48
üst 82276525
...@@ -86,6 +86,11 @@ ...@@ -86,6 +86,11 @@
#define SAL_CONFIGFILE( name ) name "rc" #define SAL_CONFIGFILE( name ) name "rc"
#endif #endif
#ifdef sun
#undef sun
#define sun sun
#endif
#if defined __clang__ #if defined __clang__
#if __has_warning("-Wpotentially-evaluated-expression") #if __has_warning("-Wpotentially-evaluated-expression")
#pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression" #pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment