Changeset 5502 in vbox

Timestamp:

Oct 25, 2007 10:42:02 AM (17 years ago)

Author:

vboxsync

Message:

XPCOM: Enabled XPCOM log -> IPRT log redirection (using NSPR_LOG_FILE=IPRT) for all platforms.

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prlog.c (modified) (5 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prlog.c

@@ -49 +49 @@
  * 04/10/2000   IBM Corp.       Added DebugBreak() definitions for OS/2
  */
-
-/* @todo cannot currently build with VBOX defined on linux platforms... */
-#if defined(VBOX) && !defined(XP_OS2)
-#undef VBOX
-#endif
 
 #if defined(VBOX) && defined(DEBUG)
@@ -413 +408 @@
 {
 #ifdef _PR_USE_STDIO_FOR_LOGGING
+
     FILE *newLogFile;
 
 #if defined(VBOX) && defined(DEBUG)
-    if ( strcmp( file, "IPRT") == 0)
-    {
+    if (strcmp(file, "IPRT") == 0) {
         /* initialize VBox Runtime */
                 RTR3Init(false, 0);
@@ -425 +420 @@
 #endif
 #ifdef XP_PC
-    if ( strcmp( file, "WinDebug") == 0)
-    {
+    if (strcmp(file, "WinDebug") == 0) {
         newLogFile = WIN32_DEBUG_FILE;
     }
@@ -453 +447 @@
     logFile = newLogFile;
     return PR_TRUE;
-#else
+
+#else /* _PR_USE_STDIO_FOR_LOGGING */
+
     PRFileDesc *newLogFile;
+
+#if defined(VBOX) && defined(DEBUG)
+    if (strcmp(file, "IPRT") == 0) {
+        /* initialize VBox Runtime */
+                RTR3Init(false, 0);
+        logFile = IPRT_DEBUG_FILE;
+        return PR_TRUE;
+    }
+#endif
 
     newLogFile = PR_Open(file, PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE, 0666);
@@ -467 +472 @@
     }
     return (PRBool) (newLogFile != 0);
+
 #endif /* _PR_USE_STDIO_FOR_LOGGING */
 }