summaryrefslogtreecommitdiff
path: root/sal/inc/osl/diagnose.h
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 16:40:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 16:40:57 +0000
commitc06a87d61edc506f2bb1d355f2296d732015d480 (patch)
treefa8b740b84ebe9bece81bb0ddce8a1de7a3e1c55 /sal/inc/osl/diagnose.h
parent047b9cb79c678bc21f486d2d0b608a75ec59ca4a (diff)
INTEGRATION: CWS dbgmacros1 (1.4.104); FILE MERGED
2003/04/09 12:08:12 kso 1.4.104.1: #108413# - debug macro unification.
Diffstat (limited to 'sal/inc/osl/diagnose.h')
-rw-r--r--sal/inc/osl/diagnose.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 59f8c7e8da63..12f0b2a8ae32 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -2,9 +2,9 @@
*
* $RCSfile: diagnose.h,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jl $ $Date: 2001-03-27 13:28:39 $
+ * last change: $Author: vg $ $Date: 2003-04-15 17:40:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -111,14 +111,15 @@ pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDeb
#endif /* __cplusplus */
#ifdef _WIN16
-#ifdef _DEBUG
-#undef _DEBUG
+#if OSL_DEBUG_LEVEL > 0
+#undef OSL_DEBUG_LEVEL
+#define OSL_DEBUG_LEVEL 0
#endif
#endif
-#ifdef _DEBUG
+#if OSL_DEBUG_LEVEL > 0
#define _OSL_DEBUG_ONLY(f) (f)
#define _OSL_TRACE _OSL_GLOBAL osl_trace
@@ -150,7 +151,7 @@ pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDeb
#define _OSL_VERIFY(c, f, l) ((void)(c))
#define _OSL_ENSURE(c, f, l, m) ((void)0)
-#endif /* !_DEBUG */
+#endif /* OSL_DEBUG_LEVEL */
#endif /* _OSL_DIAGNOSE_H_ */