[directfb-dev] [PATCH] SaWMan: Fix VOODOO defines checks

[Lionel Landwerlin]

From ce751d7d8362ac59faeebddea1c7c13890fe422f Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <llandwer...@gmail.com>
Date: Wed, 3 Nov 2010 10:47:29 +0100
Subject: [PATCH] Fix VOODOO defines checks

Signed-off-by: Lionel Landwerlin <llandwer...@gmail.com>
---
 src/sawman.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/sawman.c b/src/sawman.c
index d4417fc..bc8e41a 100644
--- a/src/sawman.c
+++ b/src/sawman.c
@@ -60,7 +60,7 @@
 #include "isawman.h"
 
 
-#ifndef DIRECTFB_BUILD_PURE_VOODOO
+#if !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
 
 D_DEBUG_DOMAIN( SaWMan_Auto,     "SaWMan/Auto",     "SaWMan auto configuration" );
 D_DEBUG_DOMAIN( SaWMan_Update,   "SaWMan/Update",   "SaWMan window manager updates" );
@@ -105,7 +105,7 @@ static DirectResult            add_tier            ( SaWMan                *sawm
                                                      DFBDisplayLayerID      layer_id,
                                                      SaWManStackingClasses  classes );
 
-#endif // !DIRECTFB_BUILD_PURE_VOODOO
+#endif // !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
 
 /**********************************************************************************************************************/
 
@@ -117,7 +117,7 @@ DirectResult
 SaWManInit( int    *argc,
             char ***argv )
 {
-#ifndef DIRECTFB_BUILD_PURE_VOODOO
+#if !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
      return sawman_config_init( argc, argv );
 #else
      return DR_OK;
@@ -127,7 +127,7 @@ SaWManInit( int    *argc,
 DirectResult
 SaWManCreate( ISaWMan **ret_sawman )
 {
-#ifndef DIRECTFB_BUILD_PURE_VOODOO
+#if !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
      DirectResult  ret;
      ISaWMan      *sawman;
 #endif
@@ -137,7 +137,7 @@ SaWManCreate( ISaWMan **ret_sawman )
 
      direct_initialize();
 
-#ifndef DIRECTFB_BUILD_PURE_VOODOO
+#if !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
      if (dfb_config->remote.host)
           return CreateRemote( dfb_config->remote.host, dfb_config->remote.session, ret_sawman );
 
@@ -197,7 +197,7 @@ CreateRemote( const char *host, int session, ISaWMan **ret_sawman )
 }
 
 /**********************************************************************************************************************/
-#ifndef DIRECTFB_BUILD_PURE_VOODOO
+#if !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
 
 DirectResult
 sawman_initialize( SaWMan         *sawman,
@@ -997,5 +997,5 @@ add_tier( SaWMan                *sawman,
 
      return DFB_OK;
 }
-#endif
+#endif // !defined(DIRECTFB_BUILD_PURE_VOODOO) || !DIRECTFB_BUILD_PURE_VOODOO
 
-- 
1.6.0.6


_______________________________________________
directfb-dev mailing list
directfb-dev@directfb.org
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev