VirtualBox

Changeset 3701 in vbox


Ignore:
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
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

    r3670 r3701  
    2727#include <string>
    2828
    29 #ifdef __LINUX__
     29#ifdef RT_OS_LINUX
    3030#include <sys/types.h>
    3131#include <sys/stat.h>
     
    4040#include <linux/cdrom.h>
    4141#include <errno.h>
    42 #endif /* __LINUX __ */
     42#endif /* RT_OS_LINUX */
    4343
    4444#include "HostUSBImpl.h"
     
    8686
    8787/*
    88 #ifdef __LINUX__
     88#ifdef RT_OS_LINUX
    8989    mUSBProxyService = new USBProxyServiceLinux (this);
    90 #elif defined __WIN__
     90#elif defined RT_OS_WINDOWS
    9191    mUSBProxyService = new USBProxyServiceWin32 (this);
    9292*/
  • trunk/src/VBox/Frontends/VBoxBFE/Logging.h

    r2981 r3701  
    3939 *  Helpful macro to trace execution.
    4040 */
    41 #define LogTrace() \
    42     LogFlow((">>>>> %s (%d): %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__))
    43 
    44 /**
    45  *  Helper macro to print the current reference count of the given COM object
    46  *  to the log file.
    47  *  @param obj  object in question (must be a pointer to an IUnknown subclass)
    48  */
    49 #define LogComRefCnt(obj) \
    50     do { \
    51         int refc = (obj)->AddRef(); refc --; \
    52         LogFlow (("{%p} " #obj ".refcount=%d\n", (obj), refc)); \
    53         (obj)->Release(); \
    54     } while (0)
    5541
    5642#if defined(DEBUG) || defined(LOG_ENABLED)
    57 #   define V_DEBUG(m)           V_LOG(m)
    58 #if defined(__WIN__)
    59 #   define V_LOG(m)             \
    60     do { Log (("[MAIN:%05u] ", GetCurrentThreadId())); Log (m); Log (("\n")); } while (0)
    61 #   define V_LOG2(m)            \
    62     do { Log2 (("[MAIN:%05u] ", GetCurrentThreadId())); Log2 (m); Log2 (("\n")); } while (0)
    63 #   define V_LOGFLOW(m)         \
    64     do { LogFlow (("[MAIN:%05u] ", GetCurrentThreadId())); LogFlow (m); LogFlow (("\n")); } while (0)
    65 #   define V_LOGFLOWMEMBER(m)   \
    66     do { LogFlow (("[MAIN:%05u] {%p} ", GetCurrentThreadId(), this)); LogFlow (m); LogFlow (("\n")); } while (0)
    67 #   define V_ASSERTMSG(m, e)    \
    68     AssertMsg(e, m)
    69 #   define V_ASSERTFAILED(m)    \
    70     AssertMsgFailed(m)
    71 #else
    72 #   define V_LOG(m)             \
    73     do { Log (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log (m); Log (("\n")); } while (0)
    74 #   define V_LOG2(m)            \
    75     do { Log2 (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log2 (m); Log2 (("\n")); } while (0)
    76 #   define V_LOGFLOW(m)         \
    77     do { LogFlow (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); LogFlow (m); LogFlow (("\n")); } while (0)
    78 #   define V_LOGFLOWMEMBER(m)   \
    79     do { LogFlow (("[MAIN:%RTnthrd] {%p} ", RTThreadNativeSelf(), this)); LogFlow (m); LogFlow (("\n")); } while (0)
    80 #   define V_ASSERTMSG(m, e)    \
    81     AssertMsg(e, m)
    82 #   define V_ASSERTFAILED(m)    \
    83     AssertMsgFailed(m)
    84 #endif
    8543#   define LogFlowMember(m)     \
    8644    do { LogFlow (("{%p} ", this)); LogFlow (m); } while (0)
    8745#else // if !DEBUG
    88 #   define V_DEBUG(m)           do {} while (0)
    89 #   define V_LOG(m)             do {} while (0)
    90 #   define V_LOG2(m)            do {} while (0)
    91 #   define V_LOGFLOW(m)         do {} while (0)
    92 #   define V_LOGFLOWMEMBER(m)   do {} while (0)
    93 #   define V_ASSERTMSG(m, e)    do {} while (0)
    94 #   define V_ASSERTFAILED(m)    do {} while (0)
    9546#   define LogFlowMember(m)     do {} while (0)
    9647#endif // !DEBUG
  • trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

    r3669 r3701  
    171171    *address = mScreen
    172172             ? (uintptr_t)mScreen->pixels
    173 #ifdef __OS2__ /* Play safe for now - this is vital when we get a larger surface than requested. */
     173#ifdef RT_OS_OS2 /* Play safe for now - this is vital when we get a larger surface than requested. */
    174174               + mScreen->offset
    175175#endif
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r3619 r3701  
    6969# define NS_GET_IID(I) IID_##I
    7070#endif
    71 #ifndef __WIN__
     71#ifndef RT_OS_WINDOWS
    7272#define IUnknown nsISupports
    7373#endif
     
    228228static void printUsage(USAGECATEGORY u64Cmd)
    229229{
    230 #ifdef __LINUX__
     230#ifdef RT_OS_LINUX
    231231    bool fLinux = true;
    232232#else
    233233    bool fLinux = false;
    234234#endif
    235 #ifdef __WIN__
     235#ifdef RT_OS_WINDOWS
    236236    bool fWin = true;
    237237#else
    238238    bool fWin = false;
    239239#endif
    240 #ifdef __DARWIN__
     240#ifdef RT_OS_DARWIN
    241241    bool fDarwin = true;
    242242#else
     
    17041704        }
    17051705    }
    1706 #ifdef __WIN__
     1706#ifdef RT_OS_WINDOWS
    17071707    else
    17081708    if (strcmp(argv[0], "hostifs") == 0)
     
    17301730        }
    17311731    }
    1732 #endif /* __WIN__ */
     1732#endif /* RT_OS_WINDOWS */
    17331733    else
    17341734    if (strcmp(argv[0], "hdds") == 0)
     
    24142414static int handleConvertDDImage(int argc, char *argv[])
    24152415{
    2416 #ifdef __LINUX__
     2416#ifdef RT_OS_LINUX
    24172417    const bool fReadFromStdIn = (argc >= 1) && !strcmp(argv[0], "stdin");
    24182418#else
     
    28232823    std::vector <char *> hostifdev (NetworkAdapterCount, 0);
    28242824    std::vector <const char *> intnet (NetworkAdapterCount, 0);
    2825 #ifdef __LINUX__
     2825#ifdef RT_OS_LINUX
    28262826    std::vector <char *> tapsetup (NetworkAdapterCount, 0);
    28272827    std::vector <char *> tapterm (NetworkAdapterCount, 0);
     
    31603160            i++;
    31613161        }
    3162 #ifdef __LINUX__
     3162#ifdef RT_OS_LINUX
    31633163        else if (strncmp(argv[i], "-tapsetup", 9) == 0)
    31643164        {
     
    31853185            i++;
    31863186        }
    3187 #endif /* __LINUX__ */
     3187#endif /* RT_OS_LINUX */
    31883188        else if (strncmp(argv[i], "-macaddress", 11) == 0)
    31893189        {
     
    33073307                uarts_server[n - 1] = argv[i];
    33083308                i++;
    3309 #ifdef __WIN__
     3309#ifdef RT_OS_WINDOWS
    33103310                if (strncmp(argv[i], "\\\\.\\pipe\\", 9))
    33113311                    return errorArgument("Uart pipe must start with \\\\.\\pipe\\");
     
    37963796                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
    37973797            }
    3798 #ifdef __WIN__
     3798#ifdef RT_OS_WINDOWS
    37993799#ifdef VBOX_WITH_WINMM
    38003800            else if (strcmp(audio, "winmm") == 0)
     
    38093809                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
    38103810            }
    3811 #endif /* __WIN__ */
    3812 #ifdef __LINUX__
     3811#endif /* RT_OS_WINDOWS */
     3812#ifdef RT_OS_LINUX
    38133813            else if (strcmp(audio, "oss") == 0)
    38143814            {
     
    38233823            }
    38243824# endif
    3825 #endif /* !__LINUX__ */
    3826 #ifdef __DARWIN__
     3825#endif /* !RT_OS_LINUX */
     3826#ifdef RT_OS_DARWIN
    38273827            else if (strcmp(audio, "coreaudio") == 0)
    38283828            {
     
    38303830                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
    38313831            }
    3832 #endif /* !__DARWIN__ */
     3832#endif /* !RT_OS_DARWIN */
    38333833            else
    38343834            {
     
    40164016            }
    40174017
    4018 #ifdef __LINUX__
     4018#ifdef RT_OS_LINUX
    40194019            /* the TAP setup application? */
    40204020            if (tapsetup[n])
     
    40444044                }
    40454045            }
    4046 #endif /* __LINUX__ */
     4046#endif /* RT_OS_LINUX */
    40474047
    40484048        }
     
    51915191}
    51925192
    5193 #ifdef __WIN__
     5193#ifdef RT_OS_WINDOWS
    51945194static int handleCreateHostIF(int argc, char *argv[],
    51955195                              ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
     
    52775277    return SUCCEEDED(rc) ? 0 : 1;
    52785278}
    5279 #endif /* __WIN__ */
     5279#endif /* RT_OS_WINDOWS */
    52805280
    52815281static int handleGetExtraData(int argc, char *argv[],
     
    64226422        { "unregisterimage",  handleUnregisterImage },
    64236423        { "showvdiinfo",      handleShowVDIInfo },
    6424 #ifdef __WIN__
     6424#ifdef RT_OS_WINDOWS
    64256425        { "createhostif",     handleCreateHostIF },
    64266426        { "removehostif",     handleRemoveHostIF },
  • trunk/src/VBox/Frontends/VirtualBox/include/XKeyboard.h

    r2981 r3701  
    2424#define __XKeyboard_h__
    2525
    26 #ifndef __LINUX__
     26#ifndef RT_OS_LINUX
    2727#error This file is X11/Linux specific!
    2828#endif
  • trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp

    r2981 r3701  
    109109#if defined (VBOX_WITH_XPCOM)
    110110
    111 #if !defined (__DARWIN__) && !defined (__OS2__)
     111#if !defined (RT_OS_DARWIN) && !defined (RT_OS_OS2)
    112112
    113113    if (NS_SUCCEEDED (rc))
     
    168168            if (NS_SUCCEEDED (rc) && isOnMainThread)
    169169            {
    170 # if !defined (__DARWIN__) && !defined (__OS2__)
     170# if !defined (RT_OS_DARWIN) && !defined (RT_OS_OS2)
    171171                if (sSocketListener)
    172172                {
  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

    r3674 r3701  
    17351735    if (focus)
    17361736    {
    1737 #ifdef __WIN__
     1737#ifdef RT_OS_WINDOWS
    17381738        if (   gs.autoCapture()
    17391739            && GetAncestor (winId(), GA_ROOT) == GetForegroundWindow())
    17401740#else
    17411741        if (gs.autoCapture())
    1742 #endif /* __WIN__ */
     1742#endif /* RT_OS_WINDOWS */
    17431743        {
    17441744            captureKbd (true);
  • trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinCursor.cpp

    r2981 r3701  
    876876g++ -g \
    877877    -framework IOKit -framework Carbon -framework QuickTime \
    878     -D__DARWIN__ -DIN_RING3 -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DTESTING \
     878    -DRT_OS_DARWIN -DIN_RING3 -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DTESTING \
    879879    -I include/ \
    880880    -I ../../../../include \
  • trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

    r3671 r3701  
    4848#endif
    4949#include <ucontext.h>
    50 #ifdef __AMD64__
     50#ifdef RT_ARCH_AMD64
    5151# define REG_PC REG_RIP
    5252#else
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette