From a02a4272e05d863061ea7c2ac142420d1f51b7ca Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 24 Aug 2011 17:59:32 +0300 Subject: Don't do the undef-redef dance for "MINIMAL_PROFILEDISCOVER" --- .../source/drivers/mozab/pre_include_mozilla.h | 46 +++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'connectivity/source') diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index e5e3dac6e9a6..7e2c5fe6607d 100755 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -26,30 +26,32 @@ * ************************************************************************/ -// Turn off DEBUG Assertions -#ifdef _DEBUG - #define _DEBUG_WAS_DEFINED _DEBUG - #ifndef MOZILLA_ENABLE_DEBUG - #undef _DEBUG +#ifndef MINIMAL_PROFILEDISCOVER + // Turn off DEBUG Assertions + #ifdef _DEBUG + #define _DEBUG_WAS_DEFINED _DEBUG + #ifndef MOZILLA_ENABLE_DEBUG + #undef _DEBUG + #endif + #else + #undef _DEBUG_WAS_DEFINED + #ifdef MOZILLA_ENABLE_DEBUG + #define _DEBUG 1 + #endif #endif -#else - #undef _DEBUG_WAS_DEFINED - #ifdef MOZILLA_ENABLE_DEBUG - #define _DEBUG 1 - #endif -#endif -// and turn off the additional virtual methods which are part of some interfaces when compiled -// with debug -#ifdef DEBUG - #define DEBUG_WAS_DEFINED DEBUG - #ifndef MOZILLA_ENABLE_DEBUG - #undef DEBUG - #endif -#else - #undef DEBUG_WAS_DEFINED - #ifdef MOZILLA_ENABLE_DEBUG - #define DEBUG 1 + // and turn off the additional virtual methods which are part of some interfaces when compiled + // with debug + #ifdef DEBUG + #define DEBUG_WAS_DEFINED DEBUG + #ifndef MOZILLA_ENABLE_DEBUG + #undef DEBUG + #endif + #else + #undef DEBUG_WAS_DEFINED + #ifdef MOZILLA_ENABLE_DEBUG + #define DEBUG 1 + #endif #endif #endif -- cgit