diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 16:41:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 16:41:18 +0000 |
| commit | da4b3b9468ef12ee3aeabf34332267d9e5489552 (patch) | |
| tree | fa4fcfc9554998a1b5f6188541e3da66975da5c5 | |
| parent | 31b0c1cd4ecfad1473d21bb4ca6eda47febabf6e (diff) | |
INTEGRATION: CWS dbgmacros1 (1.2.100); FILE MERGED
2003/04/09 12:08:15 kso 1.2.100.1: #108413# - debug macro unification.
| -rw-r--r-- | sal/inc/systools/win32/StrConvert.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h index fa7c303269bf..1cc7ac68c413 100644 --- a/sal/inc/systools/win32/StrConvert.h +++ b/sal/inc/systools/win32/StrConvert.h @@ -2,9 +2,9 @@ * * $RCSfile: StrConvert.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obr $ $Date: 2001-06-07 09:21:10 $ + * last change: $Author: vg $ $Date: 2003-04-15 17:41:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,14 @@ #define _STRCONVERT_H_ #include <windows.h> + +#ifdef NDEBUG +#define STRCONVERT_H_HAD_NDEBUG +#undef NDEBUG +#endif +#if OSL_DEBUG_LEVEL == 0 +#define NDEBUG +#endif #include <assert.h> #ifdef __cplusplus @@ -148,4 +156,11 @@ if( wcList ) \ } #endif +// Restore NDEBUG state +#ifdef STRCONVERT_H_HAD_NDEBUG +#define NDEBUG +#else +#undef NDEBUG +#endif + #endif |