include/sal/config.h | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 234e45bf1d27484b72e73fe327b1e92fda1933f1 Author: Stephan Bergmann <sberg...@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." Conflicts: include/sal/config.h Change-Id: I063453ee1115ae3f97e2835828800c74e3cb5e48 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" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits