use #if instead of #ifdef for testing config_xxx.hxx macros

http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html

Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3

53 files changed, 181 insertions, 130 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
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index 2f59b73c3d37..9be69bbfd774 100644
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
@@ -27,7 +27,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 
 // the minimum TDE version which is required at runtime
 #define MIN_KDE_VERSION_MAJOR   14
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9793bb4b510f..fd1ffcdaf43f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -117,7 +117,7 @@ namespace
 
             if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde4") )
             {
-                #ifdef ENABLE_KDE4
+                #if ENABLE_KDE4
                 return OUString("com.sun.star.ui.dialogs.KDE4FilePicker" );
                 #else
                 return OUString();
@@ -125,7 +125,7 @@ namespace
             }
             else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde") )
             {
-                #ifdef ENABLE_KDE
+                #if ENABLE_KDE
                 return OUString("com.sun.star.ui.dialogs.KDEFilePicker");
                 #else
                 return OUString();
@@ -133,7 +133,7 @@ namespace
             }
             else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("tde") )
             {
-                #ifdef ENABLE_TDE
+                #if ENABLE_TDE
                 return OUString("com.sun.star.ui.dialogs.TDEFilePicker");
                 #else
                 return OUString();
@@ -191,7 +191,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
     get(m_pHelpAgentResetBtn, "resethelpagent");
     if (!lcl_HasSystemFilePicker())
         get<VclContainer>("filedlgframe")->Hide();
-#if !defined(MACOSX) && !defined(ENABLE_GTK)
+#if !defined(MACOSX) && ! ENABLE_GTK
     get<VclContainer>("printdlgframe")->Hide();
 #endif
     get(m_pFileDlgCB, "filedlg");
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 506372f77ac6..9e8976d500dc 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -129,7 +129,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS
     m_pQuickLaunchCB->Show();
 
     //Only available in Win or if building the gtk systray
-#if !defined(WNT) && !defined(ENABLE_GTK)
+#if !defined(WNT) && ! ENABLE_GTK
     m_pQuickStarterFrame->Hide();
 #endif
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index eeca5a7c3e28..d3e7b26f37ff 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -103,7 +103,7 @@
 
 #include <config_telepathy.h>
 
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
 #include <tubes/manager.hxx>
 #endif
 
@@ -555,7 +555,7 @@ Desktop::Desktop()
 
 Desktop::~Desktop()
 {
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     TeleManager::finalize();
 #endif
 }
@@ -1619,7 +1619,7 @@ int Desktop::Main()
     aOptions.SetVCLSettings();
     SetSplashScreenProgress(60);
 
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     bool bListen = rCmdLineArgs.IsInvisible();
     TeleManager::init( bListen );
 #endif
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index cdb8b39f445f..cc27cc219578 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -94,7 +94,7 @@ extern "C" {
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_GTK
+#if ENABLE_GTK
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #else
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 90b82bcad108..09fea9224638 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -410,7 +410,7 @@ static NPError l_NPN_GetValue( NPP, NPNVariable variable, void* value )
             SAL_INFO("extensions.plugin", "xembed requested");
             break;
         case NPNVToolkit:
-#           ifdef ENABLE_GTK
+#           if ENABLE_GTK
             *(int*)value = NPNVGtk2;
 #           else
             *(int*)value = 0;
@@ -589,7 +589,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                              "0000", 4,
                              NULL );
 
-                #ifdef ENABLE_GTK
+                #if ENABLE_GTK
                 if( pInst->pGtkWindow )
                     g_object_unref( G_OBJECT(pInst->pGtkWindow) );
                 if( pInst->pGtkWidget )
@@ -675,7 +675,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                         "   \"" << pInst->argn[i] << "\"=\"" << pInst->argv[i]
                             << "\"");
 
-                #ifdef ENABLE_GTK
+                #if ENABLE_GTK
                 // check if XEMBED is to be used
                 // ask for Bool. there seems to be no clear definition whether the
                 // return value should be an int or unsigned char
@@ -712,7 +712,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                 if( pWindow->height < 1 )
                     pWindow->height = 1;
 
-                #ifdef ENABLE_GTK
+                #if ENABLE_GTK
                 if( pInst->bShouldUseXEmbed )
                 {
                     if( ! pInst->pGtkWidget )
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 64798ac15107..a5c800f412c2 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -79,7 +79,7 @@ extern "C"
         return 0;
     }
 
-    #ifndef ENABLE_GTK
+    #if ! ENABLE_GTK
     static void ThreadEventHandler( XtPointer /*client_data*/, int* /*source*/, XtInputId* id )
     {
         char buf[256];
@@ -231,7 +231,7 @@ static void signal_handler( int nSig )
     _exit(nSig);
 }
 
-#ifdef ENABLE_GTK
+#if ENABLE_GTK
 
 static gboolean noClosure( gpointer )
 {
@@ -393,7 +393,7 @@ int main( int argc, char **argv)
     }
     int nSocket = atol( argv[1] );
 
-    #ifdef ENABLE_GTK
+    #if ENABLE_GTK
     g_thread_init(NULL);
     gtk_init(&argc, &argv);
     #endif
@@ -408,7 +408,7 @@ int main( int argc, char **argv)
     pXtAppDisplay = XtOpenDisplay( app_context, NULL, "SOPlugin", "SOPlugin", NULL, 0, &argc, argv );
 
 
-    #ifdef ENABLE_GTK
+    #if ENABLE_GTK
     // integrate Xt events into GTK event loop
     GPollFD aXtPollDesc, aWakeupPollDesc;
 
@@ -481,7 +481,7 @@ int main( int argc, char **argv)
     // of XtAppMainLoop
     do
     {
-        #ifdef ENABLE_GTK
+        #if ENABLE_GTK
         g_main_context_iteration( NULL, sal_True );
         #else
         XtAppProcessEvent( app_context, XtIMAll );
@@ -490,7 +490,7 @@ int main( int argc, char **argv)
 
     SAL_INFO("extensions.plugin", "left plugin app main loop");
 
-    #ifdef ENABLE_GTK
+    #if ENABLE_GTK
     g_source_remove(xt_polling_timer_id);
     #endif
 
diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 507b752f1129..31212deed274 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -56,7 +56,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 
     @since LibreOffice 4.0
 */
-#if defined( HAVE_GCC_BUILTIN_ATOMIC )
+#if HAVE_GCC_BUILTIN_ATOMIC
 #    define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
 #else
 #    define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
@@ -73,7 +73,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 
     @since LibreOffice 4.0
 */
-#if defined( HAVE_GCC_BUILTIN_ATOMIC )
+#if HAVE_GCC_BUILTIN_ATOMIC
 #    define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
 #else
 #    define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 9ceb3b7ffcbe..2cbf95bc47c0 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -129,7 +129,7 @@ public:
     }
 
     //-----------------------------------------
-#if defined HAVE_CXX11_PERFECT_FORWARDING
+#if HAVE_CXX11_PERFECT_FORWARDING
     template< typename... Args >
     void construct (pointer p, Args &&... value)
     {
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 1336c137bbf2..912a3d4597f0 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -381,7 +381,7 @@ namespace rtl {
               using the outer class
               (the one that derives from this base class)
 */
-#if defined HAVE_THREADSAFE_STATICS
+#if HAVE_THREADSAFE_STATICS
 template<typename T, typename Unique>
 class Static {
 public:
@@ -441,7 +441,7 @@ private:
               using the outer class
               (the one that derives from this base class)
 */
-#if defined HAVE_THREADSAFE_STATICS
+#if HAVE_THREADSAFE_STATICS
 template<typename T, typename Data, typename Unique>
 class StaticWithArg {
 public:
@@ -523,7 +523,7 @@ private:
     @tparam InitAggregate
               initializer functor class
 */
-#if defined HAVE_THREADSAFE_STATICS
+#if HAVE_THREADSAFE_STATICS
 template<typename T, typename InitAggregate>
 class StaticAggregate {
 public:
@@ -588,7 +588,7 @@ public:
               Initializer functor's return type.
               Default is T (common practice).
 */
-#if defined HAVE_THREADSAFE_STATICS
+#if HAVE_THREADSAFE_STATICS
 template<typename T, typename InitData,
          typename Unique = InitData, typename Data = T>
 class StaticWithInit {
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index b5d746eaa2d7..4dabc7653e7b 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -154,7 +154,7 @@ public:
         @overload
         @since LibreOffice 3.6
      */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN // see the OString ctors
+#if HAVE_SFINAE_ANONYMOUS_BROKEN // see the OString ctors
     OStringBuffer( const char* value )
         : pData(NULL)
     {
@@ -454,7 +454,7 @@ public:
         @param   str   the characters to be appended.
         @return  this string buffer.
      */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if HAVE_SFINAE_ANONYMOUS_BROKEN
     OStringBuffer & append( const sal_Char * str )
     {
         return append( str, rtl_str_getLength( str ) );
@@ -665,7 +665,7 @@ public:
         @param      str      a character array.
         @return     this string buffer.
      */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if HAVE_SFINAE_ANONYMOUS_BROKEN
     OStringBuffer & insert( sal_Int32 offset, const sal_Char * str )
     {
         return insert( offset, str, rtl_str_getLength( str ) );
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 9233823f469f..cbb8cd580f76 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -165,7 +165,7 @@ public:
 
       @param    value       a NULL-terminated character array.
     */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if HAVE_SFINAE_ANONYMOUS_BROKEN
     // Old gcc can try to convert anonymous enums to OString and give compile error.
     // So there's no special-cased handling of string literals.
     // These are inline functions and technically both variants should work
@@ -535,7 +535,7 @@ public:
       @return   sal_True if the strings are equal;
                 sal_False, otherwise.
     */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if HAVE_SFINAE_ANONYMOUS_BROKEN
     sal_Bool equalsIgnoreAsciiCase( const sal_Char * asciiStr ) const SAL_THROW(())
     {
         return rtl_str_compareIgnoreAsciiCase( pData->buffer, asciiStr ) == 0;
diff --git a/sal/inc/rtl/stringutils.hxx b/sal/inc/rtl/stringutils.hxx
index 4a4d24b6f1b6..765319def700 100644
--- a/sal/inc/rtl/stringutils.hxx
+++ b/sal/inc/rtl/stringutils.hxx
@@ -38,7 +38,7 @@
 // Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast string concatenation off
 // (e.g. for debugging).
 #ifndef RTL_DISABLE_FAST_STRING
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
 // This feature is not part of public API and is meant to be used only internally by LibreOffice.
 #ifdef LIBO_INTERNAL_ONLY
 // Enable fast string concatenation.
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 5743800fc2ef..95993fc4a12c 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -146,7 +146,7 @@ public:
         rtl_uStringbuffer_newFromStr_WithLength( &pData, value.getStr(), value.getLength() );
     }
 
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN // see OUString ctors
+#if HAVE_SFINAE_ANONYMOUS_BROKEN // see OUString ctors
     template< int N >
     OUStringBuffer( const char (&literal)[ N ] )
         : pData(NULL)
@@ -588,7 +588,7 @@ public:
         sal_Unicode sz[RTL_USTR_MAX_VALUEOFBOOLEAN];
         return append( sz, rtl_ustr_valueOfBoolean( sz, b ) );
     }
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
     // Pointer can be automatically converted to bool, which is unwanted here.
     // Explicitly delete all pointer append() overloads to prevent this
     // (except for char* and sal_Unicode* overloads, which are handled elsewhere).
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 848810c80676..ae0af9eb8be4 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -193,7 +193,7 @@ public:
 
       @since LibreOffice 3.6
     */
-#ifdef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if HAVE_SFINAE_ANONYMOUS_BROKEN
     // Old gcc can try to convert anonymous enums to OUString and give compile error.
     // So instead have a variant for const and non-const char[].
     template< int N >
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index fa72798dd5f1..b89b0569852f 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -394,7 +394,7 @@ namespace css = ::com::sun::star;
 
     @since LibreOffice 4.1
 */
-#if defined HAVE_CXX11_DELETE
+#if HAVE_CXX11_DELETE
 #define SAL_DELETED_FUNCTION = delete
 #else
 #define SAL_DELETED_FUNCTION
@@ -407,7 +407,7 @@ namespace css = ::com::sun::star;
 
     @since LibreOffice 4.1
 */
-#if defined HAVE_CXX11_OVERRIDE
+#if HAVE_CXX11_OVERRIDE
 #define SAL_OVERRIDE override
 #else
 #define SAL_OVERRIDE
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index fcf0a1702271..baedeb87f344 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -56,7 +56,7 @@
 #define OSL_DETAIL_GETPID getpid()
 #endif
 
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
 #include <syslog.h>
 // sal/osl/unx/salinit.cxx::sal_detail_initialize updates this:
 bool sal_use_syslog;
@@ -123,7 +123,7 @@ char const * getEnvironmentVariable() {
 
 #endif
 
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
 int toSyslogPriority(sal_detail_LogLevel level) {
     switch (level) {
     default:
@@ -214,7 +214,7 @@ void log(
 {
     std::ostringstream s;
 #ifndef ANDROID
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
     if (!sal_use_syslog)
 #endif
         s << toString(level) << ':';
@@ -254,7 +254,7 @@ void log(
         area = "LibreOffice";
     __android_log_print(android_log_level, area, "%s", s.str().c_str());
 #else
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
     if (sal_use_syslog)
         syslog(toSyslogPriority(level), "%s", s.str().c_str());
     else
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index d05827eaee81..24d5b708a054 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -49,7 +49,7 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
         :   "memory");
         return ++nCount;
     }
-#if defined( HAVE_GCC_BUILTIN_ATOMIC )
+#if HAVE_GCC_BUILTIN_ATOMIC
     else
         return __sync_add_and_fetch (pCount, 1);
 #else
@@ -79,7 +79,7 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
         :   "memory");
         return --nCount;
     }
-#if defined( HAVE_GCC_BUILTIN_ATOMIC )
+#if HAVE_GCC_BUILTIN_ATOMIC
     else
         return __sync_sub_and_fetch (pCount, 1);
 #else
@@ -96,7 +96,7 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
     }
 #endif
 }
-#elif defined( HAVE_GCC_BUILTIN_ATOMIC )
+#elif HAVE_GCC_BUILTIN_ATOMIC
 oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
     return __sync_add_and_fetch(pCount, 1);
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 49fddeaeaf9f..327ca0e0d0c5 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -29,7 +29,7 @@
 #include "sal/main.h"
 #include "sal/types.h"
 
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
 #include <string.h>
 #include <syslog.h>
 // from sal/osl/all/log.cxx:
@@ -64,7 +64,7 @@ void sal_detail_initialize(int argc, char ** argv) {
         close(fd);
     }
 #endif
-#ifdef HAVE_SYSLOG_H
+#if HAVE_SYSLOG_H
     const char *use_syslog = getenv("SAL_LOG_SYSLOG");
     sal_use_syslog = use_syslog != NULL && !strcmp(use_syslog, "1");
     if (sal_use_syslog)
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 1c12684b3e5e..0fcbb842753d 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -77,7 +77,7 @@ CPPUNIT_TEST_SUITE_END();
 void test::ostring::StringLiterals::checkCtors()
 {
 // string literal ctors do not work with SFINAE broken and are disabled
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
     bool result_tmp;
     CPPUNIT_ASSERT( CONST_CTOR_USED( "test" ));
     const char good1[] = "test";
@@ -159,7 +159,7 @@ void test::ostring::StringLiterals::checkUsage()
     rtl_string_unittest_const_literal_function = false;
     CPPUNIT_ASSERT_EQUAL( foo, rtl::OString() = "foo" );
     CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
     rtl_string_unittest_const_literal_function = false;
     CPPUNIT_ASSERT( FoO.equalsIgnoreAsciiCase( "fOo" ));
     CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
@@ -264,7 +264,7 @@ void test::ostring::StringLiterals::checkNonConstUsage()
 void test::ostring::StringLiterals::checkBuffer()
 {
     rtl::OStringBuffer buf;
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
     rtl_string_unittest_const_literal_function = false;
     buf.append( "foo" );
     CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 67ae652f7d49..deea8594fb9c 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -121,7 +121,7 @@
 
 #include <config_telepathy.h>
 
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
 #include "sccollaboration.hxx"
 #endif
 
@@ -2556,7 +2556,7 @@ sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter )
         || rFilter.EqualsAscii( pFilterRtf );
 }
 
-#ifndef ENABLE_TELEPATHY
+#if ! ENABLE_TELEPATHY
 ScDocFunc *ScDocShell::CreateDocFunc()
 {
     return new ScDocFuncDirect( *this );
@@ -2592,7 +2592,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
     pSolverSaveData ( NULL ),
     pSheetSaveData  ( NULL ),
     pModificator    ( NULL )
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     , mpCollaboration( new ScCollaboration( this ) )
 #endif
 {
@@ -2641,7 +2641,7 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
     pSolverSaveData ( NULL ),
     pSheetSaveData  ( NULL ),
     pModificator    ( NULL )
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     , mpCollaboration( new ScCollaboration( this ) )
 #endif
 {
@@ -2702,7 +2702,7 @@ ScDocShell::~ScDocShell()
         OSL_FAIL("The Modificator should not exist");
         delete pModificator;
     }
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     delete mpCollaboration;
 #endif
 }
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 55054f807909..a18f127ef0dd 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -63,7 +63,7 @@ class ScOptSolverSave;
 class ScSheetSaveData;
 class ScFlatBoolRowSegments;
 struct ScColWidthParam;
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
 class ScCollaboration;
 #endif
 
@@ -111,7 +111,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
     ScSheetSaveData*    pSheetSaveData;
 
     ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     ScCollaboration*      mpCollaboration;
 #endif
 
@@ -180,7 +180,7 @@ public:
     using SfxShell::Activate;           // with sal_Bool bMDI
     using SfxShell::Deactivate;         // with sal_Bool bMDI
 
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
     SC_DLLPRIVATE ScCollaboration* GetCollaboration();
 #endif
     virtual void    Activate();
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 4d16931094ad..4e40e4fbaf8e 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -45,7 +45,7 @@
 
 #include <config_telepathy.h>
 
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
 #include "sccollaboration.hxx"
 #endif
 
@@ -106,7 +106,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
             break;
 
         case SID_COLLABORATION:
-#ifdef ENABLE_TELEPATHY
+#if ENABLE_TELEPATHY
             GetViewData()->GetDocShell()->GetCollaboration()->DisplayContacts();
 #endif
             break;
diff --git a/shell/inc/shell/kde_headers.h b/shell/inc/shell/kde_headers.h
index 161e1ff1ec8c..3ca3fa69ef26 100644
--- a/shell/inc/shell/kde_headers.h
+++ b/shell/inc/shell/kde_headers.h
@@ -22,7 +22,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 
 #include "shell/tde_headers.h"
 
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 04cb5a386de0..0e53b21c3fd6 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2620,7 +2620,7 @@ namespace {
             nReformat -= 2;
 
     #ifndef MACOSX
-    #ifndef ENABLE_GRAPHITE
+    #if ! ENABLE_GRAPHITE
             // #i28795#, #i34607#, #i38388#
             // step back six(!) more characters for complex scripts
             // this is required e.g., for Khmer (thank you, Javier!)
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index aac80883830b..17e089ff6642 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -29,7 +29,7 @@
 #include <outfont.hxx>
 #include <impfont.hxx>
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #include <graphite_layout.hxx>
 #endif
@@ -269,7 +269,7 @@ void FtFontFile::Unmap()
     mpFileMap = NULL;
 }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 // wrap FtFontInfo's table function
 const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, size_t *len)
 {
@@ -307,7 +307,7 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
     mnFaceNum( nFaceNum ),
     mnRefCount( 0 ),
     mnSynthetic( nSynthetic ),
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     mbCheckedGraphite(false),
     mpGraphiteFace(NULL),
 #endif
@@ -336,7 +336,7 @@ FtFontInfo::~FtFontInfo()
     delete mpExtraKernInfo;
     delete mpChar2Glyph;
     delete mpGlyph2Char;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     delete mpGraphiteFace;
 #endif
 }
@@ -367,7 +367,7 @@ FT_FaceRec_* FtFontInfo::GetFaceFT()
    return maFaceFT;
 }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
 {
     if (mbCheckedGraphite)
@@ -2574,7 +2574,7 @@ const unsigned char* ServerFont::GetTable(const char* pName, sal_uLong* pLength)
     return mpFontInfo->GetTable( pName, pLength );
 }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const
 {
     return mpFontInfo->GetGraphiteFace();
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 9d677e1cf252..dea75b3b2332 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -25,7 +25,7 @@
 #include <rtl/textcvt.h>
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 class GraphiteFaceWrapper;
 #endif
 
@@ -72,7 +72,7 @@ public:
     const unsigned char*  GetTable( const char*, sal_uLong* pLength=0 ) const;
 
     FT_FaceRec_*          GetFaceFT();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     GraphiteFaceWrapper*  GetGraphiteFace();
 #endif
     void                  ReleaseFaceFT( FT_FaceRec_* );
@@ -101,7 +101,7 @@ private:
     const int       mnFaceNum;
     int             mnRefCount;
     const int       mnSynthetic;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     bool            mbCheckedGraphite;
     GraphiteFaceWrapper * mpGraphiteFace;
 #endif
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index bc9fb09410a2..3ceb72442516 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -28,7 +28,7 @@
 #include <outfont.hxx>
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite_features.hxx>
 #endif
 
@@ -85,7 +85,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
 {
     // TODO: is it worth to improve this hash function?
     sal_IntPtr nFontId = reinterpret_cast<sal_IntPtr>( rFontSelData.mpFontData );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
         != -1)
     {
@@ -99,7 +99,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
     nHash   += rFontSelData.mbVertical;
     nHash   += rFontSelData.GetSlant();
     nHash   += rFontSelData.GetWeight();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     nHash   += rFontSelData.meLanguage;
 #endif
     return nHash;
@@ -134,7 +134,7 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
     if( nAWidth != nBWidth )
         return false;
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
    if (rA.meLanguage != rB.meLanguage)
         return false;
    // check for features
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 523a0e9a8e3d..4149e41b48d6 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -47,7 +47,7 @@
 #include "langboost.hxx"
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite_layout.hxx>
 #include <graphite_serverfont.hxx>
 #endif
@@ -743,7 +743,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
     if (bIsPspServerFontLayout)
     {
         const PspServerFontLayout * pPspLayout = dynamic_cast<const PspServerFontLayout*>(&rLayout);
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         const GraphiteServerFontLayout * pGrLayout = dynamic_cast<const GraphiteServerFontLayout*>(&rLayout);
 #endif
         if (pPspLayout)
@@ -752,7 +752,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
             nMinCharPos = pPspLayout->getMinCharPos();
             nMaxCharPos = pPspLayout->getMaxCharPos();
         }
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         else if (pGrLayout)
         {
         }
@@ -1021,7 +1021,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     if( m_pServerFont[ nFallbackLevel ]
         && !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
     {
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // Is this a Graphite font?
         if (GraphiteServerFontLayout::IsGraphiteEnabledFont(*m_pServerFont[nFallbackLevel]))
         {
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 9de49e7543fd..033b6463e984 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -49,7 +49,7 @@ class ServerFontLayout;
 #include <sallayout.hxx>
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 class GraphiteFaceWrapper;
 #endif
 
@@ -206,7 +206,7 @@ public:
     GlyphData&                  GetGlyphData( int nGlyphIndex );
     const GlyphMetric&          GetGlyphMetric( int nGlyphIndex )
                                 { return GetGlyphData( nGlyphIndex ).GetMetric(); }
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     virtual GraphiteFaceWrapper* GetGraphiteFace() const;
 #endif
 
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index a60b6f6d9c92..dca9497efd3a 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -30,7 +30,7 @@
 #include <boost/unordered_set.hpp>
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #endif
 
@@ -41,7 +41,7 @@ class ImplFontAttrCache;
 #define RGB_TO_PALRGB(nRGB)         ((nRGB)|0x02000000)
 #define PALRGB_TO_RGB(nPalRGB)      ((nPalRGB)&0x00ffffff)
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 class RawFontData;
 class GrFontData
 {
@@ -86,7 +86,7 @@ public:
     bool                    SupportsArabic() const      { return mbHasArabicSupport; }
     bool                    AliasSymbolsHigh() const    { return mbAliasSymbolsHigh; }
     bool                    AliasSymbolsLow() const     { return mbAliasSymbolsLow; }
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     bool                    SupportsGraphite() const    { return mbHasGraphiteSupport; }
     const gr_face*          GraphiteFace() const;
 #endif
@@ -107,7 +107,7 @@ private:
     mutable bool                    mbDisableGlyphApi;
     mutable bool                    mbHasKoreanRange;
     mutable bool                    mbHasCJKSupport;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     mutable GrFontData*             mpGraphiteData;
     mutable bool                    mbHasGraphiteSupport;
 #endif
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 9f022ed94215..df1016c7d883 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -64,7 +64,7 @@
 #include "osl/file.h"
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include "graphite_features.hxx"
 #endif
 
@@ -2077,7 +2077,7 @@ size_t FontSelectPatternAttributes::hashCode() const
     // TODO: does it pay off to improve this hash function?
     static FontNameHash aFontNameHash;
     size_t nHash = aFontNameHash( maSearchName );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     // check for features and generate a unique hash if necessary
     if (maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
         != -1)
@@ -2175,7 +2175,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo
             return false;
     }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     // check for features
     if ((rA.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
          != STRING_NOTFOUND ||
@@ -2373,7 +2373,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
         rFSD.maTargetName = GetNextFontToken( rFSD.GetFamilyName(), nTokenPos );
         aSearchName = rFSD.maTargetName;
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // Until features are properly supported, they are appended to the
         // font name, so we need to strip them off so the font is found.
         sal_Int32 nFeat = aSearchName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX);
@@ -2418,7 +2418,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
             }
         }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // restore the features to make the font selection data unique
         rFSD.maTargetName = aOrigName;
 #endif
@@ -2430,7 +2430,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
         // some systems provide special customization
         // e.g. they suggest "serif" as UI-font, but this name cannot be used directly
         //      because the system wants to map it to another font first, e.g. "Helvetica"
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // use the target name to search in the prematch hook
         rFSD.maTargetName = aBaseFontName;
 #endif
@@ -2455,7 +2455,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
             if( mpPreMatchHook->FindFontSubstitute( rFSD ) )
                 GetEnglishSearchFontName( aSearchName );
         }
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // the prematch hook uses the target name to search, but we now need
         // to restore the features to make the font selection data unique
         rFSD.maTargetName = aOrigName;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index f4cba0ea199a..bacd1465b579 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -109,7 +109,7 @@ X11SalGraphics::X11SalGraphics()
     nTextPixel_         = 0;
     nTextColor_         = MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     // check if graphite fonts have been disabled
     static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" );
     bDisableGraphite_       = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 391da493e039..96ce72da2bdf 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -67,7 +67,7 @@
 #include "outdev.h"
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite_layout.hxx>
 #include <graphite_serverfont.hxx>
 #endif
@@ -744,7 +744,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     if( mpServerFont[ nFallbackLevel ]
     && !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
     {
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         // Is this a Graphite font?
         if (!bDisableGraphite_ &&
             GraphiteServerFontLayout::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 5cddc5f2e829..49f30c1da9c4 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -22,7 +22,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 
 // the service names
 #define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.TDEFilePicker"
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 914768a3852b..afd4350f8719 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -73,7 +73,7 @@ namespace
         uno::Sequence<rtl::OUString> aRet(3);
         aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
         aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
         aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker");
 #else // ENABLE_TDE
         aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker");
@@ -703,7 +703,7 @@ void UnxFilePicker::initFilePicker()
 #endif
 
         // The executable name
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
         rtl::OUString helperurl("${ORIGIN}/tdefilepicker");
 #else // ENABLE_TDE
         rtl::OUString helperurl("${ORIGIN}/kdefilepicker");
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index 064d06c610bd..55559d2117f1 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -23,7 +23,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tqstringlist.h>
 #include <tdeapplication.h>
 #else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index acb90d8af248..b78592c3982e 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -22,11 +22,11 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <shell/tde_defines.h>
 #endif // ENABLE_TDE
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tqevent.h>
 #include <tqmutex.h>
 #include <tqthread.h>
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 5163079b4eb8..4dafb1ef0e4e 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -24,7 +24,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -78,7 +78,7 @@
 
 #endif // ENABLE_TDE
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #define QCheckBox_String    "TQCheckBox"
 #define QComboBox_String    "TQComboBox"
 #else // ENABLE_TDE
@@ -105,7 +105,7 @@ KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter,
       m_bIsExecuting( false ),
       m_bCanNotifySelection( true )
 {
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
     connect( this, SIGNAL( fileHighlighted( const TQString & ) ),
              this, SLOT( fileHighlightedCommand( const TQString & ) ) );
 #else // ENABLE_TDE
@@ -666,7 +666,7 @@ QString KDEFileDialog::localCopy( const QString &rFileName ) const
     return qDestURL.url();
 }
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 void KDEFileDialog::fileHighlightedCommand( const TQString & )
 #else // ENABLE_TDE
 void KDEFileDialog::fileHighlightedCommand( const QString & )
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index 046a1bc92645..e317a7d0e996 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -22,13 +22,13 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <shell/tde_defines.h>
 #endif // ENABLE_TDE
 
 #include <cstddef>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tdefiledialog.h>
 #include <tdefilefiltercombo.h>
 #else // ENABLE_TDE
@@ -42,7 +42,7 @@ class QVBox;
 
 class KDEFileDialog : public KFileDialog
 {
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
     TQ_OBJECT
 #else // ENABLE_TDE
     Q_OBJECT
@@ -114,7 +114,7 @@ protected:
 protected slots:
 // Qt3 moc does not really understand #ifdef and would process both slots,
 // so the FILTER_OUT_FOO tags are used to remove some slots before moc sees them.
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
     void                        fileHighlightedCommand( const TQString & ); // FILTER_OUT_TDE
 #else // ENABLE_TDE
     void                        fileHighlightedCommand( const QString & );  // FILTER_OUT_KDE
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index df39e01e43ca..8178586b14e9 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -23,7 +23,7 @@
 #include <kdefilepicker.hxx>
 #include <kdecommandthread.hxx>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tqeventloop.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
@@ -39,7 +39,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #define THIS_DESKENV_NAME_CAP "TDE"
 #define THIS_DESKENV_NAME_LOW "tde"
 #else // ENABLE_TDE
@@ -47,7 +47,7 @@
 #define THIS_DESKENV_NAME_LOW "kde"
 #endif // ENABLE_TDE
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #define KAboutData TDEAboutData
 #define KCmdLineArgs TDECmdLineArgs
 #define KCmdLineOptions TDECmdLineOptions
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 2c1f03475425..57e889a58460 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -21,7 +21,7 @@
 
 #include <kdemodalityfilter.hxx>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tdeapplication.h>
 #include <kdialogbase.h>
 #else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index 05331fe8afb3..fadf77d24097 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@@ -22,11 +22,11 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <shell/tde_defines.h>
 #endif // ENABLE_TDE
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #include <tqobject.h>
 #else // ENABLE_TDE
 #include <qobject.h>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 1724ac506385..5151350b72e2 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -46,7 +46,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #define THIS_DESKENV_NAME_CAP "TDE"
 #define THIS_DESKENV_NAME_LOW "tde"
 #else // ENABLE_TDE
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 7b8b4eeba2d7..1f9971038019 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -34,7 +34,7 @@
 
 #include <config_vclplug.h>
 
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
 #define QPushButton_String      "TQPushButton"
 #define QRadioButton_String     "TQRadioButton"
 #define QCheckBox_String        "TQCheckBox"
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 9a8cac9b2b04..f2bcd8e88f77 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -65,7 +65,7 @@
 #include <algorithm>
 
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #endif
 
@@ -1046,7 +1046,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
 }
 
 // =======================================================================
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 
 #ifdef DEBUG
 static FILE * grLogFile = NULL;
@@ -1149,7 +1149,7 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS,
     mbDisableGlyphApi( false ),
     mbHasKoreanRange( false ),
     mbHasCJKSupport( false ),
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     mpGraphiteData(NULL),
     mbHasGraphiteSupport( false ),
 #endif
@@ -1200,7 +1200,7 @@ ImplWinFontData::~ImplWinFontData()
 
     if( mpUnicodeMap )
         mpUnicodeMap->DeReference();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     if (mpGraphiteData)
         mpGraphiteData->DeReference();
 #ifdef DEBUG
@@ -1232,7 +1232,7 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
 
     ReadCmapTable( hDC );
     GetFontCapabilities( hDC );
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     static const char* pDisableGraphiteText = getenv( "SAL_DISABLE_GRAPHITE" );
     if( !pDisableGraphiteText || (pDisableGraphiteText[0] == '0') )
     {
@@ -1269,7 +1269,7 @@ void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
 
 }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 const gr_face* ImplWinFontData::GraphiteFace() const
 {
 #ifdef DEBUG
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 63f8a6559241..83bb2c3f5980 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -51,7 +51,7 @@ typedef boost::unordered_map<int,int> IntMap;
 
 // Graphite headers
 #include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 #include <i18npool/languagetag.hxx>
 #include <graphite_layout.hxx>
 #include <graphite_features.hxx>
@@ -1191,7 +1191,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
     SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0};
     aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
     aScriptControl.fContextDigits   = (0 != (rArgs.mnFlags & SAL_LAYOUT_SUBSTITUTE_DIGITS));
-#ifdef HAVE_FMERGENEUTRALITEMS
+#if HAVE_FMERGENEUTRALITEMS
     aScriptControl.fMergeNeutralItems = true;
 #endif
     // determine relevant substring and work only on it
@@ -2671,7 +2671,7 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
     return true;
 }
 
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
 
 class GraphiteLayoutWinImpl : public GraphiteLayout
 {
@@ -2897,7 +2897,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     if( !(rArgs.mnFlags & SAL_LAYOUT_COMPLEX_DISABLED)
     &&   (bUspInited || InitUSP()) )   // CTL layout engine
     {
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         if (rFontFace.SupportsGraphite())
         {
             pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
@@ -2923,7 +2923,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
         BYTE eCharSet = ANSI_CHARSET;
         if( mpLogFont )
             eCharSet = mpLogFont->lfCharSet;
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
         if (rFontFace.SupportsGraphite())
             pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
         else
@@ -3038,7 +3038,7 @@ PhysicalFontFace* ImplWinFontData::Clone() const
 {
     if( mpUnicodeMap )
         mpUnicodeMap->AddReference();
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
     if ( mpGraphiteData )
         mpGraphiteData->AddReference();
 #endif
diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx
index 23df2ba99547..fbb4834d0c0d 100644
--- a/xmlreader/inc/xmlreader/span.hxx
+++ b/xmlreader/inc/xmlreader/span.hxx
@@ -59,7 +59,7 @@ struct OOO_DLLPUBLIC_XMLREADER Span {
             begin, length, text.getStr(), text.getLength()) == 0;
     }
 
-#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
+#if ! HAVE_SFINAE_ANONYMOUS_BROKEN
     /**
      @overload
      This function accepts an ASCII string literal as its argument.