VirtualBox

Changeset 3638 in vbox


Ignore:
Timestamp:
Jul 16, 2007 1:13:59 PM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
22909
Message:

AMD64 -> RT_ARCH_AMD64; X86 -> RT_ARCH_X86; [OS] -> RT_OS_[OS].

Location:
trunk/include/VBox
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/VBoxGuest.h

    r3633 r3638  
    3939typedef uint32_t vmmDevHypPhys;
    4040
    41 #if defined(__LINUX__)
     41#if defined(RT_OS_LINUX)
    4242/** The support device name. */
    4343# define VBOXGUEST_DEVICE_NAME        "/dev/vboxadd"
    4444
    45 #elif defined(__OS2__)
     45#elif defined(RT_OS_OS2)
    4646/** The support device name. */
    4747# define VBOXGUEST_DEVICE_NAME        "\\Dev\\VBoxGst$"
    4848
    49 #elif defined(__WIN__)
     49#elif defined(RT_OS_WINDOWS)
    5050/** The support service name. */
    5151# define VBOXGUEST_SERVICE_NAME       "VBoxGuest"
    … …  
    958958 * @{
    959959 */
    960 #ifdef __AMD64__
     960#ifdef RT_OS_AMD64
    961961# define VBOXGUEST_IOCTL_FLAG     128
    962 #elif defined(__X86__)
     962#elif defined(RT_OS_X86)
    963963# define VBOXGUEST_IOCTL_FLAG     0
    964964#else
    … …  
    966966#endif
    967967
    968 #if defined(__WIN__)
     968#if defined(RT_OS_WINDOWS)
    969969# define IOCTL_CODE(DeviceType, Function, Method, Access, DataSize_ignored) \
    970970    ( ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
    971971
    972 #elif defined(__OS2__)
     972#elif defined(RT_OS_OS2)
    973973# define VBOXGUEST_IOCTL_CATEGORY                   0xc2
    974974# define VBOXGUEST_IOCTL_CODE(Function, Size)       ((unsigned char)(Function))
    … …  
    976976# define VBOXGUEST_IOCTL_CODE_FAST(Function)        ((unsigned char)(Function))
    977977
    978 #elif defined(__LINUX__)
     978#elif defined(RT_OS_LINUX)
    979979# define IOCTL_CODE(DeviceType, Function, Method_ignored, Access_ignored, DataSize) \
    980980    ( (3 << 30) | ((DeviceType) << 8) | (Function) | ((DataSize) << 16) )
    … …  
    12431243
    12441244
    1245 #ifdef __OS2__
     1245#ifdef RT_OS_OS2
    12461246
    12471247/**
    … …  
    13111311#define VBOXGUEST_IOCTL_OS2_IDC_DISCONNECT  VBOXGUEST_IOCTL_CODE(48, sizeof(uint32_t))
    13121312
    1313 #endif /* __OS2__ */
     1313#endif /* RT_OS_OS2 */
    13141314
    13151315/** @} */

  • trunk/include/VBox/asmdefs.mac

    r2981 r3638  
    163163
    164164%macro COM_S_PRINT 1+
    165 %ifdef __AMD64__
     165%ifdef RT_OS_AMD64
    166166    COM64_S_PRINT %1
    167167%else
    … …  
    252252
    253253%macro COM_S_CHAR 1
    254 %ifdef __AMD64__
     254%ifdef RT_OS_AMD64
    255255    COM64_S_CHAR %1
    256256%else
    … …  
    371371
    372372%macro COM_S_NEWLINE 0
    373 %ifdef __AMD64__
     373%ifdef RT_OS_AMD64
    374374    COM64_S_NEWLINE
    375375%else
    … …  
    499499
    500500%macro COM_S_DWORD_REG 1
    501 %ifdef __AMD64__
     501%ifdef RT_OS_AMD64
    502502    COM64_S_DWORD_REG %1
    503503%else
    … …  
    627627
    628628%macro COM_S_BYTE_REG 1
    629 %ifdef __AMD64__
     629%ifdef RT_OS_AMD64
    630630    COM64_S_BYTE_REG %1
    631631%else
    … …  
    698698
    699699%macro COM_S_DIGIT_REG 1
    700 %ifdef __AMD64__
     700%ifdef RT_OS_AMD64
    701701    COM64_S_DIGIT_REG %1
    702702%else

  • trunk/include/VBox/com/EventQueue.h

    r3634 r3638  
    2323#define ___VBox_com_EventQueue_h
    2424
    25 #if defined (__WIN__)
     25#if defined (RT_OS_WINDOWS)
    2626#include <windows.h>
    2727#else
    … …  
    8484private:
    8585
    86 #if defined (__WIN__)
     86#if defined (RT_OS_WINDOWS)
    8787
    8888    DWORD mThreadId;

  • trunk/include/VBox/com/Guid.h

    r3634 r3638  
    2323#define ___VBox_com_Guid_h
    2424
    25 #if !defined (__WIN__)
     25#if !defined (RT_OS_WINDOWS)
    2626#include <nsMemory.h>
    2727#endif
    … …  
    9999    operator const RTUUID * const () const { return &uuid; }
    100100
    101 #if defined(__WIN__)
     101#if defined(RT_OS_WINDOWS)
    102102
    103103    // to assign instances to GUIDPARAMOUT parameters from within the interface method

  • trunk/include/VBox/com/VirtualBox.h

    r3634 r3638  
    3737// generated VirtualBox COM library definition file
    3838#if !defined (VBOXCOM_NOINCLUDE)
    39 #if defined (__WIN__)
     39#if defined (RT_OS_WINDOWS)
    4040#include <VirtualBox.h>
    4141#else

  • trunk/include/VBox/com/defs.h

    r3634 r3638  
    3232#if !defined (VBOX_WITH_XPCOM)
    3333
    34 #if defined (__WIN__)
     34#if defined (RT_OS_WINDOWS)
    3535
    3636// Windows COM
    … …  
    7272#define COM_IIDOF(I) _ATL_IIDOF (I)
    7373
    74 #else // defined (__WIN__)
     74#else // defined (RT_OS_WINDOWS)
    7575
    7676#error "VBOX_WITH_XPCOM is not defined!"
    7777
    78 #endif // defined (__WIN__)
     78#endif // defined (RT_OS_WINDOWS)
    7979
    8080#else // !defined (VBOX_WITH_XPCOM)
    … …  
    8383/////////////////////////////////////////////////////////////////////////////
    8484
    85 #if defined (__OS2__)
     85#if defined (RT_OS_OS2)
    8686
    8787/* Make sure OS/2 Toolkit headers are pulled in to have
    … …  
    9696#undef TRUE
    9797
    98 #endif // defined (__OS2__)
    99 
    100 #if defined (__DARWIN__)
     98#endif // defined (RT_OS_OS2)
     99
     100#if defined (RT_OS_DARWIN)
    101101  /* CFBase.h defines these*/
    102102# undef FALSE
    103103# undef TRUE
    104 #endif  /* __DARWIN__ */
     104#endif  /* RT_OS_DARWIN */
    105105
    106106#include <nsID.h>
    … …  
    284284}
    285285
    286 #endif // !defined (__WIN__)
     286#endif // !defined (RT_OS_WINDOWS)
    287287
    288288/**

  • trunk/include/VBox/com/string.h

    r3634 r3638  
    2323#define ___VBox_com_string_h
    2424
    25 #if !defined(__WIN__)
     25#if !defined(RT_OS_WINDOWS)
    2626#include <nsMemory.h>
    2727#endif
    … …  
    296296        if (str)
    297297        {
    298 #if defined (__WIN__)
     298#if defined (RT_OS_WINDOWS)
    299299            ::RTStrFree (str);
    300300#else
    … …  
    310310        if (str && *str == 0)
    311311        {
    312 #if defined (__WIN__)
     312#if defined (RT_OS_WINDOWS)
    313313            ::RTStrFree (str);
    314314#else
    … …  
    330330        if (aSize)
    331331        {
    332 #if defined (__WIN__)
     332#if defined (RT_OS_WINDOWS)
    333333            str = (char *) ::RTMemTmpAlloc (aSize);
    334334#else
    … …  
    426426    {
    427427        if (rs)
    428 #if defined (__WIN__)
     428#if defined (RT_OS_WINDOWS)
    429429            ::RTStrDupEx (&ls, rs);
    430430#else
    … …  
    437437        if (rs)
    438438        {
    439 #if defined (__WIN__)
     439#if defined (RT_OS_WINDOWS)
    440440            ::RTStrUcs2ToUtf8 (&ls, (PRTUCS2) rs);
    441441#else

  • trunk/include/VBox/dbggui.h

    r3632 r3638  
    2222#define ___VBox_dbggui_h
    2323
    24 #if defined(__WIN__)
     24#if defined(RT_OS_WINDOWS)
    2525# include <VirtualBox.h>
    2626#else

  • trunk/include/VBox/hwacc_svm.h

    r3632 r3638  
    652652    __asm
    653653    {
    654 #   ifdef __AMD64__
     654#   ifdef RT_OS_AMD64
    655655        mov     rax, pPageGC
    656656#   else

  • trunk/include/VBox/stam.mac

    r2981 r3638  
    6262%macro STAM_COUNTER_INC 1
    6363%ifdef VBOX_WITH_STATISTICS
    64  %ifdef __AMD64__
     64 %ifdef RT_OS_AMD64
    6565    STAM64_COUNTER_INC %1
    6666 %else
    … …  
    107107%macro STAM_COUNTER_ADD 2
    108108%ifdef VBOX_WITH_STATISTICS
    109  %ifdef __AMD64__
     109 %ifdef RT_OS_AMD64
    110110     STAM64_COUNTER_ADD %1, %2
    111111 %else
    … …  
    166166%macro STAM_PROFILE_START 1
    167167%ifdef VBOX_WITH_STATISTICS
    168  %ifdef __AMD64__
     168 %ifdef RT_OS_AMD64
    169169    STAM64_PROFILE_START %1
    170170 %else
    … …  
    272272%macro STAM_PROFILE_STOP 2
    273273%ifdef VBOX_WITH_STATISTICS
    274  %ifdef __AMD64__
     274 %ifdef RT_OS_AMD64
    275275    STAM64_PROFILE_STOP %1, %2
    276276 %else
    … …  
    317317%macro STAM_PROFILE_ADV_START 1
    318318%ifdef VBOX_WITH_STATISTICS
    319  %ifdef __AMD64__
     319 %ifdef RT_OS_AMD64
    320320    STAM64_PROFILE_ADV_START %1
    321321 %else
    … …  
    366366%macro STAM_PROFILE_ADV_STOP 1
    367367%ifdef VBOX_WITH_STATISTICS
    368  %ifdef __AMD64__
     368 %ifdef RT_OS_AMD64
    369369    STAM64_PROFILE_ADV_STOP %1
    370370 %else

  • trunk/include/VBox/sup.h

    r3632 r3638  
    207207#elif defined(IN_RING0)
    208208extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
    209 # if defined(__GNUC__) && !defined(__DARWIN__) && defined(__AMD64__)
     209# if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_OS_AMD64)
    210210/** Workaround for ELF+GCC problem on 64-bit hosts.
    211211 * (GCC emits a mov with a R_X86_64_32 reloc, we need R_X86_64_64.) */

  • trunk/include/VBox/usblib.h

    r3632 r3638  
    4646
    4747#ifndef CTL_CODE
    48 # if defined(__WIN__)
     48# if defined(RT_OS_WINDOWS)
    4949#  define CTL_CODE(DeviceType, Function, Method, Access) \
    5050    ( ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
Note: See TracChangeset for help on using the changeset viewer.

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