From e37fe7d2fb85791e796193266623dcd83f2b0197 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <mueller@kde.org>
Date: Thu, 22 Nov 2007 23:28:34 +0000
Subject: [PATCH] embedding #ifdef's within macros is not portable

svn path=/trunk/KDE/kdebase/workspace/; revision=740309
---
 effects/configs_builtins.cpp | 39 +++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/effects/configs_builtins.cpp b/effects/configs_builtins.cpp
index 0e22980471..a383d43e3e 100644
--- a/effects/configs_builtins.cpp
+++ b/effects/configs_builtins.cpp
@@ -34,21 +34,32 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KDE_USE_FINAL
 KWIN_EFFECT_CONFIG_FACTORY
 #endif
-K_PLUGIN_FACTORY_DEFINITION(EffectFactory,
-    registerPlugin<KWin::DesktopGridEffectConfig>("desktopgrid");
-    registerPlugin<KWin::DimInactiveEffectConfig>("diminactive");
-    registerPlugin<KWin::MakeTransparentEffectConfig>("maketransparent");
-    registerPlugin<KWin::PresentWindowsEffectConfig>("presentwindows");
-    registerPlugin<KWin::ShadowEffectConfig>("shadow");
-    registerPlugin<KWin::ThumbnailAsideEffectConfig>("thumbnailaside");
+
+#define NON_GL_PLUGINS \
+    registerPlugin<KWin::DesktopGridEffectConfig>("desktopgrid"); \
+    registerPlugin<KWin::DimInactiveEffectConfig>("diminactive"); \
+    registerPlugin<KWin::MakeTransparentEffectConfig>("maketransparent"); \
+    registerPlugin<KWin::PresentWindowsEffectConfig>("presentwindows");   \
+    registerPlugin<KWin::ShadowEffectConfig>("shadow"); \
+    registerPlugin<KWin::ThumbnailAsideEffectConfig>("thumbnailaside"); \
     registerPlugin<KWin::ZoomEffectConfig>("zoom");
+
+#define GL_PLUGINS \
+    registerPlugin<KWin::InvertEffectConfig>("invert"); \
+    registerPlugin<KWin::LookingGlassEffectConfig>("lookingglass"); \
+    registerPlugin<KWin::MouseMarkEffectConfig>("mousemark"); \
+    registerPlugin<KWin::MagnifierEffectConfig>("magnifier"); \
+    registerPlugin<KWin::SharpenEffectConfig>("sharpen"); \
+    registerPlugin<KWin::TrackMouseEffectConfig>("trackmouse"); \
+
 #ifdef HAVE_OPENGL
-    registerPlugin<KWin::InvertEffectConfig>("invert");
-    registerPlugin<KWin::LookingGlassEffectConfig>("lookingglass");
-    registerPlugin<KWin::MouseMarkEffectConfig>("mousemark");
-    registerPlugin<KWin::MagnifierEffectConfig>("magnifier");
-    registerPlugin<KWin::SharpenEffectConfig>("sharpen");
-    registerPlugin<KWin::TrackMouseEffectConfig>("trackmouse");
-#endif
+K_PLUGIN_FACTORY_DEFINITION(EffectFactory,
+    NON_GL_PLUGINS
+    GL_PLUGINS
     )
+#else
+K_PLUGIN_FACTORY_DEFINITION(EffectFactory,
+    NON_GL_PLUGINS
+    )
+#endif
 K_EXPORT_PLUGIN(EffectFactory("kwin"))