Kaydet (Commit) 31ff4439 authored tarafından Thomas Klausner's avatar Thomas Klausner

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.
üst 85c44ad8
...@@ -78,6 +78,11 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf ...@@ -78,6 +78,11 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
#define OSL_THIS_FILE __FILE__ #define OSL_THIS_FILE __FILE__
/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */ /* 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__ #ifdef __func__
#define OSL_THIS_FUNC __func__ #define OSL_THIS_FUNC __func__
#elif defined (__PRETTY_FUNCTION__) #elif defined (__PRETTY_FUNCTION__)
...@@ -87,6 +92,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf ...@@ -87,6 +92,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
#else #else
#define OSL_THIS_FUNC " " #define OSL_THIS_FUNC " "
#endif #endif
#endif /* 1 */
/* the macro OSL_TO_STRING is intended to be an office internal macro for now */ /* the macro OSL_TO_STRING is intended to be an office internal macro for now */
#define OSL_TO_STRING( x ) #x #define OSL_TO_STRING( x ) #x
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment