Changeset 46431 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jun 7, 2013 10:03:06 AM (12 years ago)

Author:

vboxsync

Message:

baka

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src

Files:

• ipcLog.cpp (modified) (1 diff)
• ipcLog.h (modified) (3 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcLog.cpp

@@ -49 +49 @@
 
 #ifdef VBOX
-#if defined(__OS2__) && defined(PAGE_SIZE)
-#undef PAGE_SIZE
-#endif
-#include <iprt/initterm.h> // for RTR3InitDll
+# if defined(__OS2__) && defined(PAGE_SIZE)
+#  undef PAGE_SIZE
+# endif
+# include <iprt/initterm.h> // for RTR3InitDll
 #else // !VBOX
 PRBool ipcLogEnabled = PR_FALSE;

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcLog.h

@@ -53 +53 @@
 
 /* Redefine logging group to IPC */
-#ifdef LOG_GROUP
-#undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_IPC
+# ifdef LOG_GROUP
+#  undef LOG_GROUP
+# endif
+# define LOG_GROUP LOG_GROUP_IPC
 
 /* Ensure log macros are enabled */
-#ifndef LOG_ENABLED
-#define LOG_ENABLED
-#endif
+# ifndef LOG_ENABLED
+#  define LOG_ENABLED
+# endif
 
 #include <VBox/log.h>
@@ -69 +69 @@
 extern NS_HIDDEN_(void) IPC_LogBinary(const PRUint8 *data, PRUint32 len);
 
-#define IPC_LOG(_args)         \
-    PR_BEGIN_MACRO             \
-        IPC_Log _args;         \
+# define IPC_LOG(_args) \
+    PR_BEGIN_MACRO \
+        if (IPC_LOG_ENABLED()) \
+            IPC_Log _args; \
     PR_END_MACRO
 
 /* IPC_Log() internally uses LogFlow() so use LogIsFlowEnabled() below */
-#define IPC_LOG_ENABLED() (LogIsFlowEnabled())
+# define IPC_LOG_ENABLED() (LogIsFlowEnabled())
 
-#define LOG(args)     IPC_LOG(args)
+# define LOG(args)     IPC_LOG(args)
 
-#else // VBOX
+#else  /* !VBOX */
 
 extern PRBool ipcLogEnabled;
@@ -96 +97 @@
 #define LOG(args)     IPC_LOG(args)
 
-#endif // VBOX
+#endif /* !VBOX */
 
 #else // IPC_LOGGING