VirtualBox

Changeset 3668 in vbox


Ignore:
Timestamp:
Jul 17, 2007 8:56:37 AM (17 years ago)
Author:
vboxsync
Message:

replace underscore symbols in Main/

Location:
trunk/src/VBox/Main
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/AudioAdapterImpl.cpp

    r3348 r3668  
    230230        {
    231231            case AudioDriverType_NullAudioDriver:
    232 #ifdef __WIN__
     232#ifdef RT_OS_WINDOWS
    233233#ifdef VBOX_WITH_WINMM
    234234            case AudioDriverType_WINMMAudioDriver:
    235235#endif
    236236            case AudioDriverType_DSOUNDAudioDriver:
    237 #endif /* __WIN__ */
    238 #ifdef __LINUX__
     237#endif /* RT_OS_WINDOWS */
     238#ifdef RT_OS_LINUX
    239239            case AudioDriverType_OSSAudioDriver:
    240240#ifdef VBOX_WITH_ALSA
    241241            case AudioDriverType_ALSAAudioDriver:
    242242#endif
    243 #endif /* __LINUX__ */
    244 #ifdef __DARWIN__
     243#endif /* RT_OS_LINUX */
     244#ifdef RT_OS_DARWIN
    245245            case AudioDriverType_CoreAudioDriver:
    246246#endif
    247 #ifdef __OS2__
     247#ifdef RT_OS_OS2
    248248            case AudioDriverType_MMPMAudioDriver:
    249249#endif

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r3661 r3668  
    2020 */
    2121
    22 #if defined(__WIN__)
    23 #elif defined(__LINUX__)
     22#if defined(RT_OS_WINDOWS)
     23#elif defined(RT_OS_LINUX)
    2424#   include <errno.h>
    2525#   include <sys/ioctl.h>
    … …  
    12711271            case NetworkAttachmentType_HostInterfaceNetworkAttachment:
    12721272            {
    1273 #ifdef __WIN__
     1273#ifdef RT_OS_WINDOWS
    12741274                /* a valid host interface must have been set */
    12751275                Bstr hostif;
    … …  
    12951295                        hostif.raw());
    12961296                }
    1297 #endif /* __WIN__ */
     1297#endif /* RT_OS_WINDOWS */
    12981298                break;
    12991299            }
    … …  
    19101910            Guid (aId).raw());
    19111911
    1912 #ifdef __DARWIN__
     1912#ifdef RT_OS_DARWIN
    19131913    /* Notify the USB Proxy that we're about to detach the device. Since
    19141914     * we don't dare do IPC when holding the console lock, so we'll have
    … …  
    44814481    AssertReturn (task, VERR_GENERAL_FAILURE);
    44824482
    4483 #if defined(__WIN__)
     4483#if defined(RT_OS_WINDOWS)
    44844484    {
    44854485        /* initialize COM */
    … …  
    45644564    else
    45654565        fHWVirtExEnabled = (hwVirtExEnabled == TriStateBool_True);
    4566 #ifndef __DARWIN__ /** @todo Implement HWVirtExt on darwin. See #1865. */
     4566#ifndef RT_OS_DARWIN /** @todo Implement HWVirtExt on darwin. See #1865. */
    45674567    if (fHWVirtExEnabled)
    45684568    {
    … …  
    53345334                        rc = CFGMR3InsertInteger(pCfg, "FileHandle", pConsole->maTapFD[ulInstance]); RC_CHECK();
    53355335                    }
    5336 #elif defined(__WIN__)
     5336#elif defined(RT_OS_WINDOWS)
    53375337                    if (fSniffer)
    53385338                    {
    … …  
    53765376                    switch (hrc)
    53775377                    {
    5378 #ifdef __LINUX__
     5378#ifdef RT_OS_LINUX
    53795379                        case VERR_ACCESS_DENIED:
    53805380                            return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
    … …  
    53845384                                             "sure that these changes are permanently in particular if you are "
    53855385                                             "using udev"));
    5386 #endif /* __LINUX__ */
     5386#endif /* RT_OS_LINUX */
    53875387                        default:
    53885388                            AssertMsgFailed(("Could not attach to host interface! Bad!\n"));
    … …  
    55565556                break;
    55575557            }
    5558 #ifdef __WIN__
     5558#ifdef RT_OS_WINDOWS
    55595559#ifdef VBOX_WITH_WINMM
    55605560            case AudioDriverType_WINMMAudioDriver:
    … …  
    55695569                break;
    55705570            }
    5571 #endif /* __WIN__ */
    5572 #ifdef __LINUX__
     5571#endif /* RT_OS_WINDOWS */
     5572#ifdef RT_OS_LINUX
    55735573            case AudioDriverType_OSSAudioDriver:
    55745574            {
    … …  
    55835583            }
    55845584# endif
    5585 #endif /* __LINUX__ */
    5586 #ifdef __DARWIN__
     5585#endif /* RT_OS_LINUX */
     5586#ifdef RT_OS_DARWIN
    55875587            case AudioDriverType_CoreAudioDriver:
    55885588            {
    … …  
    58255825{
    58265826    LogFlowThisFunc(("\n"));
    5827 #ifdef __LINUX__
     5827#ifdef RT_OS_LINUX
    58285828    /* Command line to start the script with. */
    58295829    char szCommand[4096];
    … …  
    58915891    LogFlowThisFunc(("rc=S_OK\n"));
    58925892    return S_OK;
    5893 #else /* __LINUX__ not defined */
     5893#else /* RT_OS_LINUX not defined */
    58945894    LogFlowThisFunc(("rc=E_NOTIMPL\n"));
    58955895    return E_NOTIMPL;  /* not yet supported */
    … …  
    59515951         * Allocate a host interface device
    59525952         */
    5953 #ifdef __WIN__
     5953#ifdef RT_OS_WINDOWS
    59545954        /* nothing to do */
    59555955        int rcVBox = VINF_SUCCESS;
    5956 #elif defined(__LINUX__)
     5956#elif defined(RT_OS_LINUX)
    59575957        int rcVBox = RTFileOpen(&maTapFD[slot], "/dev/net/tun",
    59585958                                RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_INHERIT);
    … …  
    60676067            }
    60686068        }
    6069 #elif defined(__DARWIN__)
     6069#elif defined(RT_OS_DARWIN)
    60706070        /** @todo Implement tap networking for Darwin. */
    60716071        int rcVBox = VERR_NOT_IMPLEMENTED;
    6072 #elif defined(__OS2__)
     6072#elif defined(RT_OS_OS2)
    60736073        /** @todo Implement tap networking for OS/2. */
    60746074        int rcVBox = VERR_NOT_IMPLEMENTED;
    … …  
    65596559    AssertReturn (!task->mProgress.isNull(), VERR_INVALID_PARAMETER);
    65606560
    6561 #if defined(__WIN__)
     6561#if defined(RT_OS_WINDOWS)
    65626562    {
    65636563        /* initialize COM */
    … …  
    66236623        static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
    66246624        RTUINT fFlags = RTLOGFLAGS_PREFIX_TIME_PROG;
    6625 #if defined (__WIN__) || defined (__OS2__)
     6625#if defined (RT_OS_WINDOWS) || defined (RT_OS_OS2)
    66266626        fFlags |= RTLOGFLAGS_USECRLF;
    66276627#endif
    … …  
    69646964    }
    69656965
    6966 #if defined(__WIN__)
     6966#if defined(RT_OS_WINDOWS)
    69676967    /* uninitialize COM */
    69686968    CoUninitialize();

  • trunk/src/VBox/Main/HostImpl.cpp

    r3663 r3668  
    1919 */
    2020
    21 #ifdef __LINUX__
     21#ifdef RT_OS_LINUX
    2222#include <sys/types.h>
    2323#include <sys/stat.h>
    … …  
    3838#endif
    3939#include <errno.h>
    40 #endif /* __LINUX __ */
    41 
    42 #ifdef __WIN__
     40#endif /* RT_OS_LINUX */
     41
     42#ifdef RT_OS_WINDOWS
    4343#define _WIN32_DCOM
    4444#include <windows.h>
    … …  
    5151#include <shlobj.h>
    5252#include <cfgmgr32.h>
    53 #endif /* __WIN__ */
     53#endif /* RT_OS_WINDOWS */
    5454
    5555
    … …  
    6666#include "Logging.h"
    6767
    68 #ifdef __DARWIN__
     68#ifdef RT_OS_DARWIN
    6969#include "darwin/iokit.h"
    7070#endif
    7171
    72 #ifdef __WIN__
     72#ifdef RT_OS_WINDOWS
    7373#include "HostNetworkInterfaceImpl.h"
    7474#endif
    … …  
    119119    mParent = parent;
    120120
    121 #if defined (__DARWIN__) && defined (VBOX_WITH_USB)
     121#if defined (RT_OS_DARWIN) && defined (VBOX_WITH_USB)
    122122    mUSBProxyService = new USBProxyServiceDarwin (this);
    123 #elif defined (__LINUX__) && defined (VBOX_WITH_USB)
     123#elif defined (RT_OS_LINUX) && defined (VBOX_WITH_USB)
    124124    mUSBProxyService = new USBProxyServiceLinux (this);
    125 #elif defined (__WIN__) && defined (VBOX_WITH_USB)
     125#elif defined (RT_OS_WINDOWS) && defined (VBOX_WITH_USB)
    126126    mUSBProxyService = new USBProxyServiceWin32 (this);
    127127#else
    … …  
    179179    std::list <ComObjPtr <HostDVDDrive> > list;
    180180
    181 #if defined(__WIN__)
     181#if defined(RT_OS_WINDOWS)
    182182    int sz = GetLogicalDriveStrings(0, NULL);
    183183    TCHAR *hostDrives = new TCHAR[sz+1];
    … …  
    199199    while (*p);
    200200    delete[] hostDrives;
    201 #elif defined(__LINUX__)
     201#elif defined(RT_OS_LINUX)
    202202#ifdef VBOX_USE_LIBHAL
    203203    if (!getDVDInfoFromHal(list)) /* Playing with #defines in this way is nasty, I know. */
    … …  
    246246        }
    247247    }
    248 #elif defined(__DARWIN__)
     248#elif defined(RT_OS_DARWIN)
    249249    PDARWINDVD cur = DarwinGetDVDDrives();
    250250    while (cur)
    … …  
    287287    std::list <ComObjPtr <HostFloppyDrive> > list;
    288288
    289 #ifdef __WIN__
     289#ifdef RT_OS_WINDOWS
    290290    int sz = GetLogicalDriveStrings(0, NULL);
    291291    TCHAR *hostDrives = new TCHAR[sz+1];
    … …  
    307307    while (*p);
    308308    delete[] hostDrives;
    309 #elif defined(__LINUX__)
     309#elif defined(RT_OS_LINUX)
    310310#ifdef VBOX_USE_LIBHAL
    311311    if (!getFloppyInfoFromHal(list)) /* Playing with #defines in this way is nasty, I know. */
    … …  
    363363}
    364364
    365 #ifdef __WIN__
     365#ifdef RT_OS_WINDOWS
    366366
    367367static bool IsTAPDevice(const char *guid)
    … …  
    502502    return S_OK;
    503503}
    504 #endif /* __WIN__ */
     504#endif /* RT_OS_WINDOWS */
    505505
    506506STDMETHODIMP Host::COMGETTER(USBDevices)(IHostUSBDeviceCollection **aUSBDevices)
    … …  
    686686////////////////////////////////////////////////////////////////////////////////
    687687
    688 #ifdef __WIN__
     688#ifdef RT_OS_WINDOWS
    689689
    690690/**
    … …  
    874874}
    875875
    876 #endif /* __WIN__ */
     876#endif /* RT_OS_WINDOWS */
    877877
    878878STDMETHODIMP Host::CreateUSBDeviceFilter (INPTR BSTR aName, IHostUSBDeviceFilter **aFilter)
    … …  
    14581458////////////////////////////////////////////////////////////////////////////////
    14591459
    1460 #ifdef __LINUX__
     1460#ifdef RT_OS_LINUX
    14611461# ifdef VBOX_USE_LIBHAL
    14621462/**
    … …  
    18781878    return retValue;
    18791879}
    1880 #endif // __LINUX__
     1880#endif // RT_OS_LINUX
    18811881
    18821882/**
    … …  
    22062206}
    22072207
    2208 #ifdef __WIN__
     2208#ifdef RT_OS_WINDOWS
    22092209
    22102210/* The original source of the VBoxTAP adapter creation/destruction code has the following copyright */
    … …  
    30713071}
    30723072
    3073 #endif /* __WIN__ */
    3074 
     3073#endif /* RT_OS_WINDOWS */
     3074

  • trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

    r3664 r3668  
    841841    }
    842842
    843 #if !defined (__WIN__)
     843#if !defined (RT_OS_WINDOWS)
    844844    // these filters are temporarily ignored on Win32
    845845    if (!aData.mManufacturer.isMatch (Bstr (mUsb->pszManufacturer)))
    … …  
    10571057                    isImportant = false;
    10581058                    break;
    1059 #ifndef __WIN__ /* Only windows really knows whether the device is unavailable or captured. */
     1059#ifndef RT_OS_WINDOWS /* Only windows really knows whether the device is unavailable or captured. */
    10601060                case USBDeviceState_USBDeviceCaptured:
    10611061                    if (!mIsStatePending)
    … …  
    10801080                    break;
    10811081                case USBDeviceState_USBDeviceCaptured:
    1082 #ifndef __WIN__ /* Only Windows really knows whether the device is busy or captured. */
     1082#ifndef RT_OS_WINDOWS /* Only Windows really knows whether the device is busy or captured. */
    10831083                    if (!mIsStatePending)
    10841084                        return false;
    … …  
    11861186    AssertReturnVoid (isLockedOnCurrentThread());
    11871187
    1188 #ifndef __WIN__ /* no timeouts on windows yet since I don't have all the details here... */
     1188#ifndef RT_OS_WINDOWS /* no timeouts on windows yet since I don't have all the details here... */
    11891189    if (isStatePending() && mPendingSince)
    11901190    {

  • trunk/src/VBox/Main/MachineImpl.cpp

    r3652 r3668  
    2020 */
    2121
    22 #if defined(__WIN__)
    23 #elif defined(__LINUX__)
     22#if defined(RT_OS_WINDOWS)
     23#elif defined(RT_OS_LINUX)
    2424#endif
    2525
    … …  
    6363#include <algorithm>
    6464
    65 #if defined(__WIN__) || defined(__OS2__)
     65#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
    6666#define HOSTSUFF_EXE ".exe"
    67 #else /* !__WIN__ */
     67#else /* !RT_OS_WINDOWS */
    6868#define HOSTSUFF_EXE ""
    69 #endif /* !__WIN__ */
     69#endif /* !RT_OS_WINDOWS */
    7070
    7171// defines / prototypes
    … …  
    28012801    if (type == "gui")
    28022802    {
    2803 #ifdef __DARWIN__ /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
     2803#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
    28042804        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
    28052805#else
    … …  
    28102810
    28112811        Utf8Str idStr = mData->mUuid.toString();
    2812 #ifdef __WIN__ /** @todo drop this once the RTProcCreate bug has been fixed */
     2812#ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
    28132813        const char * args[] = {path, "-startvm", idStr, 0 };
    28142814#else
    … …  
    28272827
    28282828        Utf8Str idStr = mData->mUuid.toString();
    2829 #ifdef __WIN__
     2829#ifdef RT_OS_WINDOWS
    28302830        const char * args[] = {path, "-startvm", idStr, 0 };
    28312831#else
    … …  
    28442844
    28452845        Utf8Str idStr = mData->mUuid.toString();
    2846 #ifdef __WIN__
     2846#ifdef RT_OS_WINDOWS
    28472847        const char * args[] = {path, "-startvm", idStr, "-capture", 0 };
    28482848#else
    … …  
    42624262                Bstr name;
    42634263                CFGLDRQueryBSTR (attachmentNode, "name", name.asOutParam());
    4264 #ifdef __WIN__
     4264#ifdef RT_OS_WINDOWS
    42654265                /* @name can be empty on Win32, but not null */
    42664266                ComAssertBreak (!name.isNull(), rc = E_FAIL);
    … …  
    43544354        if      (driver == L"null")
    43554355            ; // Null has been set above
    4356 #ifdef __WIN__
     4356#ifdef RT_OS_WINDOWS
    43574357        else if (driver == L"winmm")
    43584358#ifdef VBOX_WITH_WINMM
    … …  
    43644364        else if (driver == L"dsound")
    43654365            audioDriver = AudioDriverType_DSOUNDAudioDriver;
    4366 #endif // __WIN__
    4367 #ifdef __LINUX__
     4366#endif // RT_OS_WINDOWS
     4367#ifdef RT_OS_LINUX
    43684368        else if (driver == L"oss")
    43694369            audioDriver = AudioDriverType_OSSAudioDriver;
    … …  
    43754375            audioDriver = AudioDriverType_OSSAudioDriver;
    43764376#endif
    4377 #endif // __LINUX__
    4378 #ifdef __DARWIN__
     4377#endif // RT_OS_LINUX
     4378#ifdef RT_OS_DARWIN
    43794379        else if (driver == L"coreaudio")
    43804380            audioDriver = AudioDriverType_CoreAudioDriver;
    43814381#endif
    4382 #ifdef __OS2__
     4382#ifdef RT_OS_OS2
    43834383        else if (driver == L"mmpm")
    43844384            audioDriver = AudioDriverType_MMPMAudioDriver;
    … …  
    60886088                    CFGLDRAppendChildNode (networkAdapterNode, "HostInterface", &attachmentNode);
    60896089                    const Bstr &name = mNetworkAdapters [slot]->data()->mHostInterface;
    6090 #ifdef __WIN__
     6090#ifdef RT_OS_WINDOWS
    60916091                    Assert (!name.isNull());
    60926092#endif
    … …  
    61696169                break;
    61706170            }
    6171 #ifdef __WIN__
     6171#ifdef RT_OS_WINDOWS
    61726172            case AudioDriverType_WINMMAudioDriver:
    6173 #ifdef VBOX_WITH_WINMM
     6173# ifdef VBOX_WITH_WINMM
    61746174            {
    61756175                CFGLDRSetString (adapterNode, "driver", "winmm");
    61766176                break;
    61776177            }
    6178 #endif
     6178# endif
    61796179            case AudioDriverType_DSOUNDAudioDriver:
    61806180            {
    … …  
    61826182                break;
    61836183            }
    6184 #endif /* __WIN__ */
    6185 #ifdef __LINUX__
     6184#endif /* RT_OS_WINDOWS */
     6185#ifdef RT_OS_LINUX
    61866186            case AudioDriverType_ALSAAudioDriver:
    6187 #ifdef VBOX_WITH_ALSA
     6187# ifdef VBOX_WITH_ALSA
    61886188            {
    61896189                CFGLDRSetString (adapterNode, "driver", "alsa");
    61906190                break;
    61916191            }
    6192 #endif
     6192# endif
    61936193            case AudioDriverType_OSSAudioDriver:
    61946194            {
    … …  
    61966196                break;
    61976197            }
    6198 #endif /* __LINUX__ */
    6199 #ifdef __DARWIN__
     6198#endif /* RT_OS_LINUX */
     6199#ifdef RT_OS_DARWIN
    62006200            case AudioDriverType_CoreAudioDriver:
    62016201            {
    … …  
    62046204            }
    62056205#endif
    6206 #ifdef __OS2__
     6206#ifdef RT_OS_OS2
    62076207            case AudioDriverType_MMPMAudioDriver:
    62086208            {
    … …  
    75437543    unconst (mType) = IsSessionMachine;
    75447544
    7545 #if defined(__WIN__)
     7545#if defined(RT_OS_WINDOWS)
    75467546    mIPCSem = NULL;
    7547 #elif defined(__OS2__)
     7547#elif defined(RT_OS_OS2)
    75487548    mIPCSem = NULLHANDLE;
    75497549#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    … …  
    75807580
    75817581    /* create the interprocess semaphore */
    7582 #if defined(__WIN__)
     7582#if defined(RT_OS_WINDOWS)
    75837583    mIPCSemName = aMachine->mData->mConfigFileFull;
    75847584    for (size_t i = 0; i < mIPCSemName.length(); i++)
    … …  
    75907590                      mIPCSemName.raw(), ::GetLastError()),
    75917591                     E_FAIL);
    7592 #elif defined(__OS2__)
     7592#elif defined(RT_OS_OS2)
    75937593    Utf8Str ipcSem = Utf8StrFmt ("\\SEM32\\VBOX\\VM\\{%Vuuid}",
    75947594                                 aMachine->mData->mUuid.raw());
    … …  
    77137713         */
    77147714        LogFlowThisFunc (("Initialization failed.\n"));
    7715 #if defined(__WIN__)
     7715#if defined(RT_OS_WINDOWS)
    77167716        if (mIPCSem)
    77177717            ::CloseHandle (mIPCSem);
    77187718        mIPCSem = NULL;
    7719 #elif defined(__OS2__)
     7719#elif defined(RT_OS_OS2)
    77207720        if (mIPCSem != NULLHANDLE)
    77217721            ::DosCloseMutexSem (mIPCSem);
    … …  
    78617861
    78627862    /* close the interprocess semaphore before leaving the shared lock */
    7863 #if defined(__WIN__)
     7863#if defined(RT_OS_WINDOWS)
    78647864    if (mIPCSem)
    78657865        ::CloseHandle (mIPCSem);
    78667866    mIPCSem = NULL;
    7867 #elif defined(__OS2__)
     7867#elif defined(RT_OS_OS2)
    78687868    if (mIPCSem != NULLHANDLE)
    78697869        ::DosCloseMutexSem (mIPCSem);
    … …  
    79257925    AutoReaderLock alock (this);
    79267926
    7927 #if defined(__WIN__) || defined(__OS2__)
     7927#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
    79287928    mIPCSemName.cloneTo (id);
    79297929    return S_OK;
    … …  
    86818681                 Uninit::Abnormal;
    86828682
    8683 #if defined(__WIN__)
     8683#if defined(RT_OS_WINDOWS)
    86848684
    86858685        AssertMsg (mIPCSem, ("semaphore must be created"));
    … …  
    86928692        ret = true;
    86938693
    8694 #elif defined(__OS2__)
     8694#elif defined(RT_OS_OS2)
    86958695
    86968696        AssertMsg (mIPCSem, ("semaphore must be created"));

  • trunk/src/VBox/Main/NetworkAdapterImpl.cpp

    r3348 r3668  
    402402    /** @todo Validate input string length. r=dmik: do it in XML schema?*/
    403403
    404 #ifdef __WIN__
     404#ifdef RT_OS_WINDOWS
    405405    // we don't allow null strings for the host interface on Win32
    406406    // (because the @name attribute of <HostInerface> must be always present,
    … …  
    990990        {
    991991            /* reset handle and device name */
    992 #ifdef __WIN__
     992#ifdef RT_OS_WINDOWS
    993993            mData->mHostInterface = "";
    994994#endif

  • trunk/src/VBox/Main/ProgressImpl.cpp

    r3191 r3668  
    769769
    770770#if !defined (VBOX_WITH_XPCOM)
    771 #if defined (__WIN__)
     771#if defined (RT_OS_WINDOWS)
    772772
    773773        ComPtr <IErrorInfo> err;
    … …  
    780780        }
    781781
    782 #endif // !defined (__WIN__)
     782#endif // !defined (RT_OS_WINDOWS)
    783783#else // !defined (VBOX_WITH_XPCOM)
    784784

  • trunk/src/VBox/Main/SessionImpl.cpp

    r3652 r3668  
    2020 */
    2121
    22 #if defined(__WIN__)
    23 #elif defined(__LINUX__)
     22#if defined(RT_OS_WINDOWS)
     23#elif defined(RT_OS_LINUX)
    2424#endif
    2525
    … …  
    4040#include <iprt/process.h>
    4141
    42 #if defined(__WIN__) || defined (__OS2__)
     42#if defined(RT_OS_WINDOWS) || defined (RT_OS_OS2)
    4343/** VM IPC mutex holder thread */
    4444static DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser);
    … …  
    9191    mType = SessionType_InvalidSessionType;
    9292
    93 #if defined(__WIN__)
     93#if defined(RT_OS_WINDOWS)
    9494    mIPCSem = NULL;
    9595    mIPCThreadSem = NULL;
    96 #elif defined(__OS2__)
     96#elif defined(RT_OS_OS2)
    9797    mIPCThread = NIL_RTTHREAD;
    9898    mIPCThreadSem = NIL_RTSEMEVENT;
    … …  
    676676        mState = SessionState_SessionClosed;
    677677        mType = SessionType_InvalidSessionType;
    678 #if defined(__WIN__)
     678#if defined(RT_OS_WINDOWS)
    679679        Assert (!mIPCSem && !mIPCThreadSem);
    680 #elif defined(__OS2__)
     680#elif defined(RT_OS_OS2)
    681681        Assert (mIPCThread == NIL_RTTHREAD &&
    682682                mIPCThreadSem == NIL_RTSEMEVENT);
    … …  
    783783    LogFlowThisFunc (("ipcId='%ls'\n", ipcId.raw()));
    784784
    785 #if defined(__WIN__)
     785#if defined(RT_OS_WINDOWS)
    786786
    787787    /*
    … …  
    826826    }
    827827
    828 #elif defined(__OS2__)
     828#elif defined(RT_OS_OS2)
    829829
    830830    /* We use XPCOM where any message (including close()) can arrive on any
    … …  
    884884{
    885885    /* release the IPC semaphore */
    886 #if defined(__WIN__)
     886#if defined(RT_OS_WINDOWS)
    887887
    888888    if (mIPCSem && mIPCThreadSem)
    … …  
    898898    }
    899899
    900 #elif defined(__OS2__)
     900#elif defined(RT_OS_OS2)
    901901
    902902    if (mIPCThread != NIL_RTTHREAD)
    … …  
    934934}
    935935
    936 #if defined(__WIN__)
     936#if defined(RT_OS_WINDOWS)
    937937/** VM IPC mutex holder thread */
    938938DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser)
    … …  
    984984#endif
    985985
    986 #if defined(__OS2__)
     986#if defined(RT_OS_OS2)
    987987/** VM IPC mutex holder thread */
    988988DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser)

  • trunk/src/VBox/Main/SharedFolderImpl.cpp

    r3007 r3668  
    147147     * RTDirOpenFiltered() call (see HostServices/SharedFolders) that seems to
    148148     * accept both the slashified paths and not. */
    149 #if defined (__OS2__) || defined (__WIN__)
     149#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
    150150    if (hostPathLen > 2 &&
    151151        RTPATH_IS_SEP (hostPath.raw()[hostPathLen - 1]) &&

  • trunk/src/VBox/Main/USBControllerImpl.cpp

    r3421 r3668  
    11211121            continue;
    11221122
    1123 #if !defined (__WIN__)
     1123#if !defined (RT_OS_WINDOWS)
    11241124        /* these filters are temporarily ignored on Win32 */
    11251125        if (!aData.mManufacturer.isMatch (manufacturer))

  • trunk/src/VBox/Main/USBDeviceFilterImpl.cpp

    r3412 r3668  
    423423                tr ("Vendor ID filter string '%ls' is not valid (error at position %d)"),
    424424                aVendorId, flt.errorPosition() + 1);
    425 #if defined (__WIN__)
     425#if defined (RT_OS_WINDOWS)
    426426        // intervalic filters are temporarily disabled
    427427        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    477477                tr ("Product ID filter string '%ls' is not valid (error at position %d)"),
    478478                aProductId, flt.errorPosition() + 1);
    479 #if defined (__WIN__)
     479#if defined (RT_OS_WINDOWS)
    480480        // intervalic filters are temporarily disabled
    481481        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    531531                tr ("Revision filter string '%ls' is not valid (error at position %d)"),
    532532                aRevision, flt.errorPosition() + 1);
    533 #if defined (__WIN__)
     533#if defined (RT_OS_WINDOWS)
    534534        // intervalic filters are temporarily disabled
    535535        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    725725                tr ("Port number filter string '%ls' is not valid (error at position %d)"),
    726726                aPort, flt.errorPosition() + 1);
    727 #if defined (__WIN__)
     727#if defined (RT_OS_WINDOWS)
    728728        // intervalic filters are temporarily disabled
    729729        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    11491149                tr ("Vendor ID filter string '%ls' is not valid (error at position %d)"),
    11501150                aVendorId, flt.errorPosition() + 1);
    1151 #if defined (__WIN__)
     1151#if defined (RT_OS_WINDOWS)
    11521152        // intervalic filters are temporarily disabled
    11531153        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    11981198                tr ("Product ID filter string '%ls' is not valid (error at position %d)"),
    11991199                aProductId, flt.errorPosition() + 1);
    1200 #if defined (__WIN__)
     1200#if defined (RT_OS_WINDOWS)
    12011201        // intervalic filters are temporarily disabled
    12021202        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    12471247                tr ("Revision filter string '%ls' is not valid (error at position %d)"),
    12481248                aRevision, flt.errorPosition() + 1);
    1249 #if defined (__WIN__)
     1249#if defined (RT_OS_WINDOWS)
    12501250        // intervalic filters are temporarily disabled
    12511251        if (!flt.first().isNull() && flt.first().isValid())
    … …  
    14221422                tr ("Port number filter string '%ls' is not valid (error at position %d)"),
    14231423                aPort, flt.errorPosition() + 1);
    1424 #if defined (__WIN__)
     1424#if defined (RT_OS_WINDOWS)
    14251425        // intervalic filters are temporarily disabled
    14261426        if (!flt.first().isNull() && flt.first().isValid())

  • trunk/src/VBox/Main/VirtualBoxBase.cpp

    r3191 r3668  
    2121
    2222#if !defined (VBOX_WITH_XPCOM)
    23 #if defined (__WIN__)
     23#if defined (RT_OS_WINDOWS)
    2424#include <windows.h>
    2525#include <dbghelp.h>
    … …  
    509509    AssertReturn (aLock, (void) 0);
    510510
    511 #if (defined(__LINUX__) || defined(__OS2__)) && defined(__GNUC__)
     511#if (defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && defined(__GNUC__)
    512512
    513513    RTCritSectEnterDebug (aLock,
    … …  
    515515                          (RTUINTPTR) __builtin_return_address (1));
    516516
    517 #elif defined(__WIN__)
     517#elif defined(RT_OS_WINDOWS)
    518518
    519519    STACKFRAME sf;
    … …  
    572572    RTCritSectEnter (aLock);
    573573
    574 #endif // defined(__LINUX__)...
     574#endif // defined(RT_OS_LINUX)...
    575575}
    576576
    … …  
    674674
    675675#if !defined (VBOX_WITH_XPCOM)
    676 #if defined (__WIN__)
     676#if defined (RT_OS_WINDOWS)
    677677
    678678        ComPtr <IVirtualBoxErrorInfo> curInfo;

  • trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

    r3191 r3668  
    8888
    8989#if !defined (VBOX_WITH_XPCOM)
    90 #if defined (__WIN__)
     90#if defined (RT_OS_WINDOWS)
    9191
    9292/**
    … …  
    143143}
    144144
    145 #endif // defined (__WIN__)
     145#endif // defined (RT_OS_WINDOWS)
    146146#else // !defined (VBOX_WITH_XPCOM)
    147147

  • trunk/src/VBox/Main/VirtualBoxImpl.cpp

    r3482 r3668  
    3434#include "GuestOSTypeImpl.h"
    3535
    36 #ifdef __WIN__
     36#ifdef RT_OS_WINDOWS
    3737#include "win32/svchlp.h"
    3838#endif
    … …  
    276276    {
    277277        /* start the client watcher thread */
    278 #if defined(__WIN__)
     278#if defined(RT_OS_WINDOWS)
    279279        unconst (mWatcherData.mUpdateReq) = ::CreateEvent (NULL, FALSE, FALSE, NULL);
    280 #elif defined(__OS2__)
     280#elif defined(RT_OS_OS2)
    281281        RTSemEventCreate (&unconst (mWatcherData.mUpdateReq));
    282282#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    … …  
    417417    }
    418418    mWatcherData.mProcesses.clear();
    419 #if defined(__WIN__)
     419#if defined(RT_OS_WINDOWS)
    420420    if (mWatcherData.mUpdateReq != NULL)
    421421    {
    … …  
    423423        unconst (mWatcherData.mUpdateReq) = NULL;
    424424    }
    425 #elif defined(__OS2__)
     425#elif defined(RT_OS_OS2)
    426426    if (mWatcherData.mUpdateReq != NIL_RTSEMEVENT)
    427427    {
    … …  
    21542154}
    21552155
    2156 #ifdef __WIN__
     2156#ifdef RT_OS_WINDOWS
    21572157
    21582158struct StartSVCHelperClientData
    … …  
    23882388}
    23892389
    2390 #endif /* __WIN__ */
     2390#endif /* RT_OS_WINDOWS */
    23912391
    23922392/**
    … …  
    24042404
    24052405    /* sent an update request */
    2406 #if defined(__WIN__)
     2406#if defined(RT_OS_WINDOWS)
    24072407    ::SetEvent (mWatcherData.mUpdateReq);
    2408 #elif defined(__OS2__)
     2408#elif defined(RT_OS_OS2)
    24092409    RTSemEventSignal (mWatcherData.mUpdateReq);
    24102410#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    … …  
    24252425
    24262426    /// @todo (dmik) Win32?
    2427 #ifndef __WIN__
     2427#ifndef RT_OS_WINDOWS
    24282428    AutoLock alock (this);
    24292429    mWatcherData.mProcesses.push_back (pid);
    … …  
    33503350        if (aHardDisk->storageType() == HardDiskStorageType_VirtualDiskImage)
    33513351#if !defined (VBOX_WITH_XPCOM)
    3352 #if defined(__WIN__)
     3352#if defined(RT_OS_WINDOWS)
    33533353            /// @todo (dmik) stupid BSTR declaration lacks the BCSTR counterpart
    33543354            const_cast <BSTR> (aFilePathFull) = aHardDisk->asVDI()->filePathFull();
    … …  
    43734373    size_t cnt = 0;
    43744374
    4375 #if defined(__WIN__)
     4375#if defined(RT_OS_WINDOWS)
    43764376
    43774377    HRESULT hrc = CoInitializeEx (NULL,
    … …  
    44534453    ::CoUninitialize();
    44544454
    4455 #elif defined (__OS2__)
     4455#elif defined (RT_OS_OS2)
    44564456
    44574457    /// @todo (dmik) processes reaping!

  • trunk/src/VBox/Main/glue/EventQueue.cpp

    r2981 r3668  
    2929////////////////////////////////////////////////////////////////////////////////
    3030
    31 #if defined (__WIN__)
     31#if defined (RT_OS_WINDOWS)
    3232
    3333#define CHECK_THREAD_RET(ret) \
    … …  
    3838    } while (0)
    3939
    40 #else // !defined (__WIN__)
     40#else // !defined (RT_OS_WINDOWS)
    4141
    4242#define CHECK_THREAD_RET(ret) \
    … …  
    5151    } while (0)
    5252
    53 #endif // !defined (__WIN__)
     53#endif // !defined (RT_OS_WINDOWS)
    5454
    5555/**
    … …  
    6262EventQueue::EventQueue()
    6363{
    64 #if defined (__WIN__)
     64#if defined (RT_OS_WINDOWS)
    6565
    6666    mThreadId = GetCurrentThreadId();
    … …  
    112112EventQueue::~EventQueue()
    113113{
    114 #if defined (__WIN__)
     114#if defined (RT_OS_WINDOWS)
    115115#else
    116116    // process all pending events before destruction
    … …  
    137137BOOL EventQueue::postEvent (Event *event)
    138138{
    139 #if defined (__WIN__)
     139#if defined (RT_OS_WINDOWS)
    140140
    141141    return PostThreadMessage (mThreadId, WM_USER, (WPARAM) event, NULL);
    … …  
    180180    CHECK_THREAD_RET (FALSE);
    181181
    182 #if defined (__WIN__)
     182#if defined (RT_OS_WINDOWS)
    183183
    184184    MSG msg;

  • trunk/src/VBox/Main/glue/com.cpp

    r3387 r3668  
    4747
    4848
    49 #ifdef __DARWIN__
     49#ifdef RT_OS_DARWIN
    5050#define VBOX_USER_HOME_SUFFIX   "Library/VirtualBox"
    5151#else

  • trunk/src/VBox/Main/include/Collection.h

    r2981 r3668  
    5858    public VirtualBoxSupportErrorInfoImpl <IfaceVectorEnumerator <IEnum, IEnumItem,
    5959                                           EnumItem, ComponentClass>, IEnum>,
    60 #ifdef __WIN__
     60#ifdef RT_OS_WINDOWS
    6161    public CComObjectRootEx <CComSingleThreadModel>,
    6262#else
    … …  
    182182    public VirtualBoxSupportErrorInfoImpl <ReadonlyIfaceVector <IColl, ICollItem,
    183183                                           IEnum, CollItem, Enum, ComponentClass>, IColl>,
    184 #ifdef __WIN__
     184#ifdef RT_OS_WINDOWS
    185185    public CComObjectRootEx <CComSingleThreadModel>,
    186186#else
    … …  
    476476    COM_DECL_READONLY_ENUM_AND_COLLECTION_AS_END (prefix, iface)
    477477
    478 #ifdef __WIN__
     478#ifdef RT_OS_WINDOWS
    479479
    480480#define COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX(itemcls, iface, prefix)
    … …  
    482482#define COM_IMPL_READONLY_ENUM_AND_COLLECTION_AS(prefix, iface)
    483483
    484 #else // !__WIN__
     484#else // !RT_OS_WINDOWS
    485485
    486486/**
    … …  
    558558    COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX (0, iface, prefix)
    559559
    560 #endif // !__WIN__
     560#endif // !RT_OS_WINDOWS
    561561
    562562#endif // ____H_COLLECTION

  • trunk/src/VBox/Main/include/HostImpl.h

    r3566 r3668  
    2727#include "USBDeviceFilterImpl.h"
    2828
    29 #ifdef __WIN__
     29#ifdef RT_OS_WINDOWS
    3030#include "win32/svchlp.h"
    3131#endif
    … …  
    7272    STDMETHOD(COMGETTER(USBDevices))(IHostUSBDeviceCollection **aUSBDevices);
    7373    STDMETHOD(COMGETTER(USBDeviceFilters))(IHostUSBDeviceFilterCollection ** aUSBDeviceFilters);
    74 #ifdef __WIN__
     74#ifdef RT_OS_WINDOWS
    7575    STDMETHOD(COMGETTER(NetworkInterfaces))(IHostNetworkInterfaceCollection **networkInterfaces);
    7676#endif
    … …  
    8585
    8686    // IHost methods
    87 #ifdef __WIN__
     87#ifdef RT_OS_WINDOWS
    8888    STDMETHOD(CreateHostNetworkInterface) (INPTR BSTR aName,
    8989                                           IHostNetworkInterface **aHostNetworkInterface,
    … …  
    119119    USBProxyService *usbProxyService() { return mUSBProxyService; }
    120120
    121 #ifdef __WIN__
     121#ifdef RT_OS_WINDOWS
    122122    static int networkInterfaceHelperServer (SVCHlpClient *aClient,
    123123                                             SVCHlpMsg::Code aMsgCode);
    … …  
    129129private:
    130130
    131 #ifdef __LINUX__
     131#ifdef RT_OS_LINUX
    132132# ifdef VBOX_USE_LIBHAL
    133133    bool getDVDInfoFromHal(std::list <ComObjPtr <HostDVDDrive> > &list);
    … …  
    153153                                 ComObjPtr <HostUSBDevice> &aDevice);
    154154
    155 #ifdef __WIN__
     155#ifdef RT_OS_WINDOWS
    156156    static int createNetworkInterface (SVCHlpClient *aClient,
    157157                                       const Utf8Str &aName,

  • trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h

    r2981 r3668  
    2323#define ____H_HOSTNETWORKINTERFACEIMPL
    2424
    25 #ifndef __WIN__
     25#ifndef RT_OS_WINDOWS
    2626#error This is Windows only stuff!
    2727#endif

  • trunk/src/VBox/Main/include/HostUSBDeviceImpl.h

    r3566 r3668  
    177177
    178178    friend class USBProxyService;
    179 #ifdef __LINUX__
     179#ifdef RT_OS_LINUX
    180180    friend class USBProxyServiceLinux;
    181181#endif

  • trunk/src/VBox/Main/include/MachineImpl.h

    r3652 r3668  
    766766    bool checkForDeath();
    767767
    768 #if defined (__WIN__)
     768#if defined (RT_OS_WINDOWS)
    769769    HANDLE ipcSem() { return mIPCSem; }
    770 #elif defined (__OS2__)
     770#elif defined (RT_OS_OS2)
    771771    HMTX ipcSem() { return mIPCSem; }
    772772#endif
    … …  
    832832
    833833    /** interprocess semaphore handle (id) for this machine */
    834 #if defined(__WIN__)
     834#if defined(RT_OS_WINDOWS)
    835835    HANDLE mIPCSem;
    836836    Bstr mIPCSemName;
    837 #elif defined(__OS2__)
     837#elif defined(RT_OS_OS2)
    838838    HMTX mIPCSem;
    839839    Bstr mIPCSemName;

  • trunk/src/VBox/Main/include/NetworkAdapterImpl.h

    r3348 r3668  
    4242            , mAttachmentType (NetworkAttachmentType_NoNetworkAttachment)
    4343            ,  mCableConnected (TRUE), mTraceEnabled (FALSE)
    44 #ifdef __WIN__
     44#ifdef RT_OS_WINDOWS
    4545            , mHostInterface ("") // cannot be null
    4646#endif

  • trunk/src/VBox/Main/include/SessionImpl.h

    r3652 r3668  
    2626#include "ConsoleImpl.h"
    2727
    28 #ifdef __WIN__
     28#ifdef RT_OS_WINDOWS
    2929#include "win32/resource.h"
    3030#endif
    … …  
    4545    public VirtualBoxSupportErrorInfoImpl <Session, ISession>,
    4646    public VirtualBoxSupportTranslation <Session>,
    47 #ifdef __WIN__
     47#ifdef RT_OS_WINDOWS
    4848    public IDispatchImpl<ISession, &IID_ISession, &LIBID_VirtualBox,
    4949                         kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>,
    … …  
    128128
    129129    /* interprocess semaphore handle (id) for the opened machine */
    130 #if defined(__WIN__)
     130#if defined(RT_OS_WINDOWS)
    131131    HANDLE mIPCSem;
    132132    HANDLE mIPCThreadSem;
    133 #elif defined(__OS2__)
     133#elif defined(RT_OS_OS2)
    134134    RTTHREAD mIPCThread;
    135135    RTSEMEVENT mIPCThreadSem;

  • trunk/src/VBox/Main/include/USBProxyService.h

    r3662 r3668  
    243243#ifdef VBOX_WITH_USB
    244244
    245 # ifdef __DARWIN__
     245# ifdef RT_OS_DARWIN
    246246#  include <VBox/param.h>
    247247#  undef PAGE_SHIFT
    … …  
    285285    bool volatile mFakeAsync;
    286286};
    287 # endif /* __DARWIN__ */
    288 
    289 
    290 # ifdef __LINUX__
     287# endif /* RT_OS_DARWIN */
     288
     289
     290# ifdef RT_OS_LINUX
    291291#  include <stdio.h>
    292292
    … …  
    326326    unsigned mUdevPolls;
    327327};
    328 # endif /* __LINUX__ */
    329 
    330 
    331 # ifdef __WIN__
     328# endif /* RT_OS_LINUX */
     329
     330
     331# ifdef RT_OS_WINDOWS
    332332/**
    333333 * The Win32 hosted USB Proxy Service.
    … …  
    356356    HANDLE hEventInterrupt;
    357357};
    358 # endif /* __WIN__ */
     358# endif /* RT_OS_WINDOWS */
    359359
    360360#endif /* VBOX_WITH_USB */

  • trunk/src/VBox/Main/include/VirtualBoxBase.h

    r3033 r3668  
    4343#include <map>
    4444
    45 #if defined (__WIN__)
     45#if defined (RT_OS_WINDOWS)
    4646
    4747#include <atlcom.h>
    … …  
    119119};
    120120
    121 #endif // defined (__WIN__)
     121#endif // defined (RT_OS_WINDOWS)
    122122
    123123// macros
    … …  
    381381
    382382class ATL_NO_VTABLE VirtualBoxBaseNEXT_base
    383 #ifdef __WIN__
     383#ifdef RT_OS_WINDOWS
    384384    : public CComObjectRootEx <CComMultiThreadModel>
    385385#else
    … …  
    877877/// @todo (dmik) remove after we switch to VirtualBoxBaseNEXT completely
    878878class ATL_NO_VTABLE VirtualBoxBase : public VirtualBoxBaseNEXT_base
    879 //#ifdef __WIN__
     879//#ifdef RT_OS_WINDOWS
    880880//    : public CComObjectRootEx<CComMultiThreadModel>
    881881//#else
    … …  
    11081108class ATL_NO_VTABLE VirtualBoxSupportErrorInfoImpl
    11091109    : protected VirtualBoxSupportErrorInfoImplBase
    1110 #if defined (__WIN__)
     1110#if defined (RT_OS_WINDOWS)
    11111111    , public ISupportErrorInfo
    11121112#else
    … …  
    11151115public:
    11161116
    1117 #if defined (__WIN__)
     1117#if defined (RT_OS_WINDOWS)
    11181118    STDMETHOD(InterfaceSupportsErrorInfo) (REFIID riid)
    11191119    {
    … …  
    11461146        return bSupports ? S_OK : S_FALSE;
    11471147    }
    1148 #endif // defined (__WIN__)
     1148#endif // defined (RT_OS_WINDOWS)
    11491149
    11501150protected:

  • trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h

    r2981 r3668  
    2828
    2929class ATL_NO_VTABLE VirtualBoxErrorInfo
    30 #if defined (__WIN__)
     30#if defined (RT_OS_WINDOWS)
    3131    : public CComObjectRootEx <CComMultiThreadModel>
    3232#else
    … …  
    4848    NS_DECL_ISUPPORTS
    4949
    50 #if defined (__WIN__)
     50#if defined (RT_OS_WINDOWS)
    5151
    5252    HRESULT init (IErrorInfo *aInfo);
    … …  
    5858    STDMETHOD(GetHelpContext) (DWORD *pdwHelpContext);
    5959
    60 #else // !defined (__WIN__)
     60#else // !defined (RT_OS_WINDOWS)
    6161
    6262    HRESULT init (nsIException *aInfo);

  • trunk/src/VBox/Main/include/VirtualBoxImpl.h

    r3480 r3668  
    3434#include <map>
    3535
    36 #ifdef __WIN__
     36#ifdef RT_OS_WINDOWS
    3737#include "win32/resource.h"
    3838#endif
    … …  
    5656class SystemProperties;
    5757
    58 #ifdef __WIN__
     58#ifdef RT_OS_WINDOWS
    5959class SVCHlpClient;
    6060#endif
    … …  
    6767    public VirtualBoxSupportErrorInfoImpl <VirtualBox, IVirtualBox>,
    6868    public VirtualBoxSupportTranslation <VirtualBox>,
    69 #ifdef __WIN__
     69#ifdef RT_OS_WINDOWS
    7070    public IDispatchImpl<IVirtualBox, &IID_IVirtualBox, &LIBID_VirtualBox,
    7171                         kTypeLibraryMajorVersion, kTypeLibraryMinorVersion>,
    … …  
    186186    HRESULT removeProgress (INPTR GUIDPARAM aId);
    187187
    188 #ifdef __WIN__
     188#ifdef RT_OS_WINDOWS
    189189    typedef DECLCALLBACKPTR (HRESULT, SVCHelperClientFunc)
    190190        (SVCHlpClient *aClient, Progress *aProgress, void *aUser, int *aVrc);
    … …  
    354354    {
    355355        ClientWatcherData()
    356 #if defined(__WIN__)
     356#if defined(RT_OS_WINDOWS)
    357357            : mUpdateReq (NULL)
    358 #elif defined(__OS2__)
     358#elif defined(RT_OS_OS2)
    359359            : mUpdateReq (NIL_RTSEMEVENT)
    360360#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    … …  
    366366
    367367        // const objects not requiring locking
    368 #if defined(__WIN__)
     368#if defined(RT_OS_WINDOWS)
    369369        const HANDLE mUpdateReq;
    370 #elif defined(__OS2__)
     370#elif defined(RT_OS_OS2)
    371371        const RTSEMEVENT mUpdateReq;
    372372#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    … …  
    393393    static DECLCALLBACK(int) AsyncEventHandler (RTTHREAD thread, void *pvUser);
    394394
    395 #ifdef __WIN__
     395#ifdef RT_OS_WINDOWS
    396396    static DECLCALLBACK(int) SVCHelperClientThread (RTTHREAD aThread, void *aUser);
    397397#endif

  • trunk/src/VBox/Main/include/VirtualBoxXMLUtil.h

    r3191 r3668  
    3636
    3737/** VirtualBox XML settings version string */
    38 #if defined (__WIN__)
     38#if defined (RT_OS_WINDOWS)
    3939#   define VBOX_XML_PLATFORM     "windows"
    40 #elif defined (__LINUX__)
     40#elif defined (RT_OS_LINUX)
    4141#   define VBOX_XML_PLATFORM     "linux"
    42 #elif defined (__DARWIN__)
     42#elif defined (RT_OS_DARWIN)
    4343#   define VBOX_XML_PLATFORM     "macosx"
    44 #elif defined (__OS2__)
     44#elif defined (RT_OS_OS2)
    4545#   define VBOX_XML_PLATFORM     "os2"
    4646#else

  • trunk/src/VBox/Main/linux/server.cpp

    r3652 r3668  
    5656
    5757// for the backtrace signal handler
    58 #if defined(DEBUG) && defined(__LINUX__)
     58#if defined(DEBUG) && defined(RT_OS_LINUX)
    5959# define USE_BACKTRACE
    6060#endif
    … …  
    6666# endif
    6767# include <ucontext.h>
    68 # ifdef __AMD64__
     68# ifdef RT_ARCH_AMD64
    6969#  define REG_PC REG_RIP
    7070# else
    … …  
    992992    static RTFILE pidFile = NIL_RTFILE;
    993993
    994 #ifdef __OS2__
     994#ifdef RT_OS_OS2
    995995
    996996    /* nothing to do here, the process is supposed to be already
    … …  
    998998    NOREF(fDaemonize);
    999999
    1000 #else // ifdef __OS2__
     1000#else // ifdef RT_OS_OS2
    10011001
    10021002    static int daemon_pipe_fds[2];
    … …  
    10621062    }
    10631063
    1064 #endif // ifdef __OS2__
     1064#endif // ifdef RT_OS_OS2
    10651065
    10661066#if defined(USE_BACKTRACE)
    … …  
    11781178        {
    11791179            printf ("\nStarting event loop....\n[send TERM signal to quit]\n");
    1180 #ifndef __OS2__
     1180#ifndef RT_OS_OS2
    11811181            /* now we're ready, signal the parent process */
    11821182            write(daemon_pipe_fds[1], "READY", strlen("READY"));
    … …  
    12391239    if (fDaemonize)
    12401240    {
    1241 #ifndef __OS2__
     1241#ifndef RT_OS_OS2
    12421242        /* close writing end of the pipe as well */
    12431243        close(daemon_pipe_fds[1]);

  • trunk/src/VBox/Main/linux/server_module.cpp

    r3388 r3668  
    2020 */
    2121
    22 #ifdef __OS2__
     22#ifdef RT_OS_OS2
    2323# include <prproces.h>
    2424#endif
    … …  
    5959
    6060/// @todo move this to RT headers (and use them in MachineImpl.cpp as well)
    61 #if defined(__WIN__) || defined(__OS2__)
     61#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
    6262#define HOSTSUFF_EXE ".exe"
    63 #else /* !__WIN__ */
     63#else /* !RT_OS_WINDOWS */
    6464#define HOSTSUFF_EXE ""
    65 #endif /* !__WIN__ */
     65#endif /* !RT_OS_WINDOWS */
    6666
    6767
    … …  
    169169                startedOnce = true;
    170170
    171 #ifdef __OS2__
     171#ifdef RT_OS_OS2
    172172                char *const args[] = { VBoxSVCPath, "--automate", 0 };
    173173                /* use NSPR because we want the process to be detached right

  • trunk/src/VBox/Main/testcase/tstAPI.cpp

    r3480 r3668  
    447447    do
    448448    {
    449 #if defined __LINUX__
     449#if defined RT_OS_LINUX
    450450        Bstr src = L"/mnt/hugaida/common/develop/innotek/images/freedos-linux.vdi";
    451451#else
    … …  
    484484        static const wchar_t *Names[] =
    485485        {
    486 #ifndef __LINUX__
     486#ifndef RT_OS_LINUX
    487487            L"E:/Develop/innotek/images/thinker/freedos.vdi",
    488488            L"E:/Develop/innotek/images/thinker/fReeDoS.vDI",
    … …  
    550550    {
    551551        ComPtr <IMachine> machine;
    552 #if defined (__LINUX__)
     552#if defined (RT_OS_LINUX)
    553553        Bstr baseDir = L"/tmp/vbox";
    554554#else

  • trunk/src/VBox/Main/xml/cfgldr.cpp

    r2981 r3668  
    107107#define OLECHAR wchar_t
    108108#define BSTR void*
    109 #if defined(__WIN__)
     109#if defined(RT_OS_WINDOWS)
    110110extern "C" BSTR __stdcall SysAllocString(const OLECHAR* sz);
    111111#else

  • trunk/src/VBox/Main/xml/cfgldrhlp.cpp

    r2981 r3668  
    2020 */
    2121
    22 #ifdef __WIN__
     22#ifdef RT_OS_WINDOWS
    2323# if _MSC_VER < 1400
    2424/// @todo Without this I cannot get the stuff to
    … …  
    3333}
    3434# endif
    35 #endif /* __WIN__ */
     35#endif /* RT_OS_WINDOWS */
    3636
    3737#include "cfgldrhlp.h"
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