3 files changed, 10 insertions, 23 deletions
diff --git a/sal/osl/os2/diagnose.c b/sal/osl/os2/diagnose.c
index 538f8d3fb95a..999c304ae77e 100644
--- a/sal/osl/os2/diagnose.c
+++ b/sal/osl/os2/diagnose.c
@@ -36,6 +36,8 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 
+#include "printtrace.h"
+
 BYTE oslTraceEnv[] = "OSL_TRACE_TO_FILE";
 
 typedef pfunc_osl_printDebugMessage oslDebugMessageFunc;
@@ -54,29 +56,11 @@ void SAL_CALL osl_breakDebug()
 /************************************************************************/
 /* osl_trace */
 /************************************************************************/
-/* comment this define to stop output thread identifier*/
-#define OSL_TRACE_THREAD 1
-void SAL_CALL osl_trace (
-    const sal_Char* lpszFormat, ...)
-{
+void osl_trace(char const * pszFormat, ...) {
     va_list args;
-
-#if defined(OSL_PROFILING)
-    fprintf(stderr, "Time: %06lu : ", osl_getGlobalTimer() );
-#else
-#if defined(OSL_TRACE_THREAD)
-    fprintf(stderr,"Thread: %6d :",osl_getThreadIdentifier(NULL));
-#else
-    fprintf(stderr, "Trace Message: ");
-#endif
-#endif
-
-    va_start(args, lpszFormat);
-    vfprintf(stderr, lpszFormat, args);
+    va_start(args, pszFormat);
+    printTrace(0, pszFormat, args); /* TODO: pid */
     va_end(args);
-
-    fprintf(stderr,"\n");
-    fflush(stderr);
 }
 
 /*----------------------------------------------------------------------------*/
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index 0782384a127f..fbff1e900df4 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -298,8 +298,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #if !defined(_WIN32)  && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && \
     !defined(AIX)     && \
-    !defined(SOLARIS) && !defined(MAC) && \
-    !defined(MACOSX)
+    !defined(SOLARIS) && !defined(MACOSX)
 #   error "Target plattform not specified !"
 #endif
 
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c
index d4b01a98ad78..df66d354addc 100644
--- a/sal/osl/os2/thread.c
+++ b/sal/osl/os2/thread.c
@@ -550,6 +550,10 @@ void SAL_CALL osl_yieldThread()
     DosSleep(0);
 }
 
+void osl_setThreadName(char const * name) {
+    (void) name;
+}
+
 typedef struct _TLS
 {
     PULONG                          pulPtr;