diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-19 16:44:12 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-20 11:34:18 +0100 |
| commit | 52f8321c412cad280c9029f10f9aef03f4f20544 (patch) | |
| tree | 9942cfe490f7107177ad69175be3039b0f20b32a /config_host | |
| parent | 151abb8b2b9d3a22229b98cec12e29484d12109b (diff) | |
use #if instead of #ifdef for testing config_xxx.hxx macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html
Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3
Diffstat (limited to 'config_host')
| -rw-r--r-- | config_host/config_global.h.in | 27 | ||||
| -rw-r--r-- | config_host/config_graphite.h.in | 3 | ||||
| -rw-r--r-- | config_host/config_mingw.h.in | 3 | ||||
| -rw-r--r-- | config_host/config_telepathy.h.in | 3 | ||||
| -rw-r--r-- | config_host/config_vclplug.h.in | 15 |
5 files changed, 51 insertions, 0 deletions
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index 5e7150b44581..87033db7f066 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -13,11 +13,38 @@ Any change in this header will cause a rebuild of almost everything. #define CONFIG_GLOBAL_H #undef HAVE_CXX11_DELETE +#ifndef HAVE_CXX11_DELETE +#define HAVE_CXX11_DELETE 0 +#endif + #undef HAVE_CXX11_OVERRIDE +#ifndef HAVE_CXX11_OVERRIDE +#define HAVE_CXX11_OVERRIDE 0 +#endif + #undef HAVE_CXX11_PERFECT_FORWARDING +#ifndef HAVE_CXX11_PERFECT_FORWARDING +#define HAVE_CXX11_PERFECT_FORWARDING 0 +#endif + #undef HAVE_GCC_BUILTIN_ATOMIC +#ifndef HAVE_GCC_BUILTIN_ATOMIC +#define HAVE_GCC_BUILTIN_ATOMIC 0 +#endif + #undef HAVE_SFINAE_ANONYMOUS_BROKEN +#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN +#define HAVE_SFINAE_ANONYMOUS_BROKEN 0 +#endif + #undef HAVE_THREADSAFE_STATICS +#ifndef HAVE_THREADSAFE_STATICS +#define HAVE_THREADSAFE_STATICS 0 +#endif + #undef HAVE_SYSLOG_H +#ifndef HAVE_SYSLOG_H +#define HAVE_SYSLOG_H 0 +#endif #endif diff --git a/config_host/config_graphite.h.in b/config_host/config_graphite.h.in index eb7a7b3400f7..2822abfde539 100644 --- a/config_host/config_graphite.h.in +++ b/config_host/config_graphite.h.in @@ -2,5 +2,8 @@ #define CONFIG_GRAPHITE_H #undef ENABLE_GRAPHITE +#ifndef ENABLE_GRAPHITE +#define ENABLE_GRAPHITE 0 +#endif #endif diff --git a/config_host/config_mingw.h.in b/config_host/config_mingw.h.in index 5a050252c15f..3747b7a7316b 100644 --- a/config_host/config_mingw.h.in +++ b/config_host/config_mingw.h.in @@ -2,5 +2,8 @@ #define CONFIG_MINGW #undef HAVE_FMERGENEUTRALITEMS +#ifndef HAVE_FMERGENEUTRALITEMS +#define HAVE_FMERGENEUTRALITEMS 0 +#endif #endif diff --git a/config_host/config_telepathy.h.in b/config_host/config_telepathy.h.in index f8752b5f5336..22bdc15a5832 100644 --- a/config_host/config_telepathy.h.in +++ b/config_host/config_telepathy.h.in @@ -2,5 +2,8 @@ #define CONFIG_TELEPATHY #undef ENABLE_TELEPATHY +#ifndef ENABLE_TELEPATHY +#define ENABLE_TELEPATHY 0 +#endif #endif diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in index 46c6bd1aea77..9088a85185ef 100644 --- a/config_host/config_vclplug.h.in +++ b/config_host/config_vclplug.h.in @@ -8,8 +8,23 @@ Settings about which X11 desktops have support enabled. #define CONFIG_VCLPLUG_H #undef ENABLE_GTK +#ifndef ENABLE_GTK +#define ENABLE_GTK 0 +#endif + #undef ENABLE_KDE +#ifndef ENABLE_KDE +#define ENABLE_KDE 0 +#endif + #undef ENABLE_KDE4 +#ifndef ENABLE_KDE4 +#define ENABLE_KDE4 0 +#endif + #undef ENABLE_TDE +#ifndef ENABLE_TDE +#define ENABLE_TDE 0 +#endif #endif |