diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-16 11:29:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-16 12:18:11 +0100 |
| commit | c52c20a9fbb9a1a75e57ac0ca08d057f4266e12c (patch) | |
| tree | f0809773058632aa139ff31abe3e4fd996096826 /include | |
| parent | 136014b52eeed89c562c2ab7a6fd9fd2d0fbe963 (diff) | |
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@redhat.com>
Conflicts:
include/sal/config.h
Change-Id: I063453ee1115ae3f97e2835828800c74e3cb5e48
(cherry picked from commit 234e45bf1d27484b72e73fe327b1e92fda1933f1)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sal/config.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sal/config.h b/include/sal/config.h index 93a4898b0202..c45936581a70 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" |