diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-27 11:24:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-27 11:24:40 +0000 |
| commit | 5bd25e1fa9c70907909ea437ad8effdfd0dc7830 (patch) | |
| tree | db6be4bd736a52aec257666a6f6ba14a9682429b /sal | |
| parent | 2a225b7376b726e1bcf32ad52bab27165bcb240f (diff) | |
INTEGRATION: CWS kso13 (1.5.266); FILE MERGED
2004/12/17 10:25:01 kso 1.5.266.1: #i39195# - OSL_TRACE only active if OSL_DEBUG_LEVEL>1
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/osl/diagnose.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index 12f0b2a8ae32..75af0932b074 100644 --- a/sal/inc/osl/diagnose.h +++ b/sal/inc/osl/diagnose.h @@ -2,9 +2,9 @@ * * $RCSfile: diagnose.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-15 17:40:57 $ + * last change: $Author: obo $ $Date: 2005-01-27 12:24:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,7 +122,6 @@ pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDeb #if OSL_DEBUG_LEVEL > 0 #define _OSL_DEBUG_ONLY(f) (f) -#define _OSL_TRACE _OSL_GLOBAL osl_trace #define _OSL_ASSERT(c, f, l) \ do \ { \ @@ -146,14 +145,20 @@ pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDeb #else #define _OSL_DEBUG_ONLY(f) ((void)0) -#define _OSL_TRACE 1 ? ((void)0) : _OSL_GLOBAL osl_trace #define _OSL_ASSERT(c, f, l) ((void)0) #define _OSL_VERIFY(c, f, l) ((void)(c)) #define _OSL_ENSURE(c, f, l, m) ((void)0) #endif /* OSL_DEBUG_LEVEL */ -#endif /* _OSL_DIAGNOSE_H_ */ +#if OSL_DEBUG_LEVEL > 1 + +#define _OSL_TRACE _OSL_GLOBAL osl_trace + +#else +#define _OSL_TRACE 1 ? ((void)0) : _OSL_GLOBAL osl_trace +#endif /* OSL_DEBUG_LEVEL */ +#endif /* _OSL_DIAGNOSE_H_ */ |