diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2010-10-22 14:04:58 +0200 |
|---|---|---|
| committer | Thomas Klausner <wiz@NetBSD.org> | 2010-10-22 14:04:58 +0200 |
| commit | 311cae41f2f94f00f4a417ad2ac9f07e1ce37ea7 (patch) | |
| tree | 366c9022e88a151e291547114a54bdaf17c1d763 | |
| parent | e3ef8152ac31106223339a232a72cea0806f4500 (diff) | |
Disable preprocessor checks for OSL_THIS_FUNC and make it " " for now.
The tests can't work (see
http://www.openoffice.org/issues/show_bug.cgi?id=114290) but for
some reason, on NetBSD find __PRETTY_FUNC__. However, that is not
a macro, but a language identifier and cannot be concatenated in
the way used here.
| -rw-r--r-- | sal/inc/osl/diagnose.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index cbfabf3a3..fa7833695 100644 --- a/sal/inc/osl/diagnose.h +++ b/sal/inc/osl/diagnose.h @@ -78,6 +78,11 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf #define OSL_THIS_FILE __FILE__ /* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */ +/* as documented in http://www.openoffice.org/issues/show_bug.cgi?id=114290 , + this cannot work, so disable it for now */ +#if 1 +#define OSL_THIS_FUNC " " +#else #ifdef __func__ #define OSL_THIS_FUNC __func__ #elif defined (__PRETTY_FUNCTION__) @@ -87,6 +92,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf #else #define OSL_THIS_FUNC " " #endif +#endif /* 1 */ /* the macro OSL_TO_STRING is intended to be an office internal macro for now */ #define OSL_TO_STRING( x ) #x |