Changeset 3701 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Jul 18, 2007 7:27:21 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22993

Message:

RT_OS_*, removed superflous logging macros in VBoxBFE

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• HostUSBImpl.cpp (modified) (3 diffs)
• Logging.h (modified) (1 diff)
• SDLFramebuffer.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

@@ -27 +27 @@
 #include <string>
 
-#ifdef __LINUX__
+#ifdef RT_OS_LINUX
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -40 +40 @@
 #include <linux/cdrom.h>
 #include <errno.h>
-#endif /* __LINUX __ */
+#endif /* RT_OS_LINUX */
 
 #include "HostUSBImpl.h"
@@ -86 +86 @@
 
 /*
-#ifdef __LINUX__
+#ifdef RT_OS_LINUX
     mUSBProxyService = new USBProxyServiceLinux (this);
-#elif defined __WIN__
+#elif defined RT_OS_WINDOWS
     mUSBProxyService = new USBProxyServiceWin32 (this);
 */

trunk/src/VBox/Frontends/VBoxBFE/Logging.h

@@ -39 +39 @@
  *  Helpful macro to trace execution.
  */
-#define LogTrace() \
-    LogFlow((">>>>> %s (%d): %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__))
-
-/**
- *  Helper macro to print the current reference count of the given COM object
- *  to the log file.
- *  @param obj  object in question (must be a pointer to an IUnknown subclass)
- */
-#define LogComRefCnt(obj) \
-    do { \
-        int refc = (obj)->AddRef(); refc --; \
-        LogFlow (("{%p} " #obj ".refcount=%d\n", (obj), refc)); \
-        (obj)->Release(); \
-    } while (0)
 
 #if defined(DEBUG) || defined(LOG_ENABLED)
-#   define V_DEBUG(m)           V_LOG(m)
-#if defined(__WIN__)
-#   define V_LOG(m)             \
-    do { Log (("[MAIN:%05u] ", GetCurrentThreadId())); Log (m); Log (("\n")); } while (0)
-#   define V_LOG2(m)            \
-    do { Log2 (("[MAIN:%05u] ", GetCurrentThreadId())); Log2 (m); Log2 (("\n")); } while (0)
-#   define V_LOGFLOW(m)         \
-    do { LogFlow (("[MAIN:%05u] ", GetCurrentThreadId())); LogFlow (m); LogFlow (("\n")); } while (0)
-#   define V_LOGFLOWMEMBER(m)   \
-    do { LogFlow (("[MAIN:%05u] {%p} ", GetCurrentThreadId(), this)); LogFlow (m); LogFlow (("\n")); } while (0)
-#   define V_ASSERTMSG(m, e)    \
-    AssertMsg(e, m)
-#   define V_ASSERTFAILED(m)    \
-    AssertMsgFailed(m)
-#else
-#   define V_LOG(m)             \
-    do { Log (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log (m); Log (("\n")); } while (0)
-#   define V_LOG2(m)            \
-    do { Log2 (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log2 (m); Log2 (("\n")); } while (0)
-#   define V_LOGFLOW(m)         \
-    do { LogFlow (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); LogFlow (m); LogFlow (("\n")); } while (0)
-#   define V_LOGFLOWMEMBER(m)   \
-    do { LogFlow (("[MAIN:%RTnthrd] {%p} ", RTThreadNativeSelf(), this)); LogFlow (m); LogFlow (("\n")); } while (0)
-#   define V_ASSERTMSG(m, e)    \
-    AssertMsg(e, m)
-#   define V_ASSERTFAILED(m)    \
-    AssertMsgFailed(m)
-#endif
 #   define LogFlowMember(m)     \
     do { LogFlow (("{%p} ", this)); LogFlow (m); } while (0)
 #else // if !DEBUG
-#   define V_DEBUG(m)           do {} while (0)
-#   define V_LOG(m)             do {} while (0)
-#   define V_LOG2(m)            do {} while (0)
-#   define V_LOGFLOW(m)         do {} while (0)
-#   define V_LOGFLOWMEMBER(m)   do {} while (0)
-#   define V_ASSERTMSG(m, e)    do {} while (0)
-#   define V_ASSERTFAILED(m)    do {} while (0)
 #   define LogFlowMember(m)     do {} while (0)
 #endif // !DEBUG

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

@@ -171 +171 @@
     *address = mScreen
              ? (uintptr_t)mScreen->pixels
-#ifdef __OS2__ /* Play safe for now - this is vital when we get a larger surface than requested. */
+#ifdef RT_OS_OS2 /* Play safe for now - this is vital when we get a larger surface than requested. */
                + mScreen->offset
 #endif