From 31ff44395e2bb71ea8282649fdc15a671c93f5fe Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Fri, 22 Oct 2010 14:04:58 +0200 Subject: 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. --- sal/inc/osl/diagnose.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sal') diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index b0038ee604fb..bb7de30f037b 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 -- cgit