User: hr Date: 06/06/19 18:51:03 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MNSInclude.hxx
Log: INTEGRATION: CWS warnings01 (1.9.30); FILE MERGED 2005/11/21 10:07:54 fs 1.9.30.2: #i57457# warning-free code on unx* 2005/11/07 14:43:56 fs 1.9.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MNSInclude.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx?r1=1.9&r2=1.10 Delta lines: +8 -34 -------------------- --- MNSInclude.hxx 8 Sep 2005 06:27:53 -0000 1.9 +++ MNSInclude.hxx 20 Jun 2006 01:51:01 -0000 1.10 @@ -39,28 +39,9 @@ // Only include Mozilla include files once and using this file... // -#ifndef BOOL -# define MOZ_BOOL - -# define BOOL mozBOOL -# define Bool mozBooL -#endif - -// Turn off DEBUG Assertions -#ifdef _DEBUG - #define _DEBUG_WAS_DEFINED _DEBUG - #undef _DEBUG -#else - #undef _DEBUG_WAS_DEFINED -#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 - #undef DEBUG -#else - #undef DEBUG_WAS_DEFINED +#include "pre_include_mozilla.h" +#if defined __GNUC__ + #pragma GCC system_header #endif #include <nsDebug.h> @@ -68,6 +49,10 @@ #include <nsCOMPtr.h> #include <nsISupportsArray.h> #include <nsString.h> +#if defined __SUNPRO_CC +#pragma disable_warn + // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again +#endif #include <nsMemory.h> #include <prtypes.h> #include <nsRDFCID.h> @@ -91,17 +76,6 @@ #include <nsIAbDirFactory.h> #include <nsIRunnable.h> -#ifdef MOZ_BOOL -# undef BOOL -# undef Bool -#endif - -#ifdef DEBUG_WAS_DEFINED - #define DEBUG DEBUG_WAS_DEFINED -#endif - -#ifdef _DEBUG_WAS_DEFINED - #define _DEBUG _DEBUG_WAS_DEFINED -#endif +#include "post_include_mozilla.h" #endif // _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
