VirtualBox

Changeset 30788 in vbox


Ignore:
Timestamp:
Jul 12, 2010 11:20:45 AM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
63590
Message:

include,Config.kmk: Made the headers syntax check cleanly on linux.amd64 w/ gcc v4.3.4.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r30513 r30788  
    24392439ifeq ($(VBOX_LDR_FMT),elf)
    24402440TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
    2441 TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) -std=c99
     2441TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) -std=gnu99
    24422442TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
    24432443TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
    … …  
    32283228
    32293229TEMPLATE_VBOXMAINEXE_TOOL                = $(VBOX_GCC_TOOL)
    3230 if 1 ## @todo Why isn't this template using VBOX_GCC_PEDANTIC_CXX?
    32313230TEMPLATE_VBOXMAINEXE_CXXFLAGS            = -g -pipe \
    32323231        $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) -Wno-long-long -Wno-non-virtual-dtor -Wshadow \
    32333232        -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \
    32343233        $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden)
    3235 else
    3236 TEMPLATE_VBOXMAINEXE_CXXFLAGS            = -g -pipe \
    3237         $(VBOX_GCC_WARN) -Wno-long-long -Wno-non-virtual-dtor -Wshadow \
    3238         -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \
    3239         $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden)
    3240 endif
    32413234TEMPLATE_VBOXMAINEXE_CXXFLAGS.x86        = -m32
    32423235TEMPLATE_VBOXMAINEXE_CXXFLAGS.amd64      = -m64
    32433236TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile   = -finstrument-functions
    3244 TEMPLATE_VBOXMAINEXE_CFLAGS              = -g -pipe $(VBOX_GCC_PEDANTIC_C) \
     3237TEMPLATE_VBOXMAINEXE_CFLAGS              = -g -pipe $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \
    32453238        $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden)
    32463239TEMPLATE_VBOXMAINEXE_CFLAGS.x86          = -m32

  • trunk/include/Makefile.kmk

    r28800 r30788  
    2222LIBRARIES = SyntaxVBoxIncludeR3 SyntaxVBoxIncludeR0 SyntaxVBoxIncludeRC
    2323
    24 cpp_hdrs := \
     24# Omit headers that are using C++ features and upsets gcc.
     25cpp_features_hdrs := \
     26        VBox/hwaccm.h \
     27        VBox/hwacc_vmx.h
     28
     29# Omit headers that are C++ and ring-3.
     30r3_cpp_hdrs := \
    2531        VBox/dbggui.h \
    2632        VBox/settings.h \
    2733        $(wildcard iprt/*_cpp.h iprt/cpp/*.h )
    2834
     35# Ring-3 only headers.
    2936r3_only_hdrs := \
    3037        VBox/vrdpapi.h \
    … …  
    3441        VBox/dbus.h \
    3542        VBox/uvm.h \
     43        VBox/vscsi.h \
    3644        iprt/tcp.h \
    3745        iprt/localipc.h \
    3846        iprt/linux/sysfs.h \
     47        iprt/socket.h
    3948
    4049# We omit a few headers which have platform specific issues or are templates.
    … …  
    4352        VBox/VBoxGL2D.h \
    4453        VBox/WinNetConfig.h \
    45         VBox/dbus-calls.h \
    4654        VBox/usblib-win.h \
    4755        VBox/usblib-solaris.h \
     56        VBox/VDEPlug.h \
     57        \
     58        VBox/dbus-calls.h \
     59        VBox/VDEPlugSymDefs.h \
     60        VBox/VBoxKeyboard.h \
     61        iprt/runtime-loader.h \
     62        \
    4863        $(foreach os,$(filter-out $(KBUILD_TARGET),$(KBUILD_OSES)),iprt/$(os)/% VBox/$(os)/%) \
    4964        $(xforeach arch,$(KBUILD_ARCHES),iprt/nocrt/$(arch)/%) \
    5065        , $(wildcard VBox/*.h iprt/*.h iprt/*/*.h))
    5166
     67# ring-3, ring-0 and raw-mode context specific exclusions.
    5268hdrs.r3 := $(filter-out , $(hdrs))
    53 hdrs.r0 := $(filter-out $(cpp_hdrs) $(r3_only_hdrs), $(hdrs))
    54 hdrs.gc := $(filter-out \
     69hdrs.r0 := $(filter-out $(r3_cpp_hdrs) $(r3_only_hdrs), $(hdrs))
     70hdrs.rc := $(filter-out \
    5571        VBox/VBoxGuestLib.h \
    5672        VBox/gvm.h \
    … …  
    5975        iprt/alloc.h \
    6076        iprt/alloca.h \
    61         $(cpp_hdrs) \
     77        $(r3_cpp_hdrs) \
    6278        $(r3_only_hdrs) \
    6379        , $(hdrs))
    … …  
    6581SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
    6682SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM
     83SyntaxVBoxIncludeR3_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
    6784SyntaxVBoxIncludeR3_SOURCES := \
    6885        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r3)))) \
    … …  
    7188SyntaxVBoxIncludeR0_TEMPLATE = VBoxR0
    7289SyntaxVBoxIncludeR0_DEFS = VBOX_WITH_HGCM
     90SyntaxVBoxIncludeR0_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
    7391SyntaxVBoxIncludeR0_SOURCES := \
    7492        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r0)))) \
    … …  
    7795SyntaxVBoxIncludeRC_TEMPLATE = VBoxRc
    7896SyntaxVBoxIncludeRC_DEFS = VBOX_WITH_HGCM
     97SyntaxVBoxIncludeRC_CDEFS = VBOX_WITHOUT_UNNAMED_UNIONS
    7998SyntaxVBoxIncludeRC_SOURCES := \
    80         $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.gc)))) \
    81         $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.gc))))
     99        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.rc)))) \
     100        $(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.rc))))
    82101
    83102
    … …  
    94113
    95114$$(PATH_TARGET)/$(flatname)-c.c: $(VBOX_ROOT_INCLUDE_MAKEFILE)  | $$(PATH_TARGET)/
    96 ifn1of ($(hdr), $(cpp_hdrs) )
     115ifn1of ($(hdr), $(r3_cpp_hdrs) $(cpp_features_hdrs) )
    97116        $(QUIET)$$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
    98117else

  • trunk/include/VBox/VBoxHDD.h

    r30555 r30788  
    274274DECLINLINE(PVDINTERFACE) VDInterfaceGet(PVDINTERFACE pVDIfs, VDINTERFACETYPE enmInterface)
    275275{
    276     AssertMsgReturn(   (enmInterface >= VDINTERFACETYPE_FIRST)
    277                     && (enmInterface < VDINTERFACETYPE_INVALID),
     276    AssertMsgReturn(   enmInterface >= VDINTERFACETYPE_FIRST
     277                    && enmInterface < VDINTERFACETYPE_INVALID,
    278278                    ("enmInterface=%u", enmInterface), NULL);
    279279
    … …  
    308308                               void *pvUser, PVDINTERFACE *ppVDIfs)
    309309{
    310 
    311     /** Argument checks. */
    312     AssertMsgReturn(   (enmInterface >= VDINTERFACETYPE_FIRST)
    313                     && (enmInterface < VDINTERFACETYPE_INVALID),
     310    /* Argument checks. */
     311    AssertMsgReturn(   enmInterface >= VDINTERFACETYPE_FIRST
     312                    && enmInterface < VDINTERFACETYPE_INVALID,
    314313                    ("enmInterface=%u", enmInterface), VERR_INVALID_PARAMETER);
    315314
    … …  
    347346    int rc = VERR_NOT_FOUND;
    348347
    349     /** Argument checks. */
     348    /* Argument checks. */
    350349    AssertMsgReturn(VALID_PTR(pInterface),
    351350                    ("pInterface=%#p", pInterface),
    … …  
    436435DECLINLINE(PVDINTERFACEERROR) VDGetInterfaceError(PVDINTERFACE pInterface)
    437436{
     437    PVDINTERFACEERROR pInterfaceError;
     438
    438439    /* Check that the interface descriptor is a error interface. */
    439     AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_ERROR)
    440                     && (pInterface->cbSize == sizeof(VDINTERFACE)),
     440    AssertMsgReturn(   pInterface->enmInterface == VDINTERFACETYPE_ERROR
     441                    && pInterface->cbSize == sizeof(VDINTERFACE),
    441442                    ("Not an error interface"), NULL);
    442443
    443     PVDINTERFACEERROR pInterfaceError = (PVDINTERFACEERROR)pInterface->pCallbacks;
     444    pInterfaceError = (PVDINTERFACEERROR)pInterface->pCallbacks;
    444445
    445446    /* Do basic checks. */
    446     AssertMsgReturn(   (pInterfaceError->cbSize == sizeof(VDINTERFACEERROR))
    447                     && (pInterfaceError->enmInterface == VDINTERFACETYPE_ERROR),
     447    AssertMsgReturn(   pInterfaceError->cbSize == sizeof(VDINTERFACEERROR)
     448                    && pInterfaceError->enmInterface == VDINTERFACETYPE_ERROR,
    448449                    ("A non error callback table attached to a error interface descriptor\n"), NULL);
    449450
    … …  
    632633DECLINLINE(PVDINTERFACEASYNCIO) VDGetInterfaceAsyncIO(PVDINTERFACE pInterface)
    633634{
     635    PVDINTERFACEASYNCIO pInterfaceAsyncIO;
     636
    634637    /* Check that the interface descriptor is a async I/O interface. */
    635638    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_ASYNCIO)
    … …  
    637640                    ("Not an async I/O interface"), NULL);
    638641
    639     PVDINTERFACEASYNCIO pInterfaceAsyncIO = (PVDINTERFACEASYNCIO)pInterface->pCallbacks;
     642    pInterfaceAsyncIO = (PVDINTERFACEASYNCIO)pInterface->pCallbacks;
    640643
    641644    /* Do basic checks. */
    … …  
    691694DECLINLINE(PVDINTERFACEPROGRESS) VDGetInterfaceProgress(PVDINTERFACE pInterface)
    692695{
     696    PVDINTERFACEPROGRESS pInterfaceProgress;
     697
    693698    /* Check that the interface descriptor is a progress interface. */
    694699    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_PROGRESS)
    … …  
    697702
    698703
    699     PVDINTERFACEPROGRESS pInterfaceProgress = (PVDINTERFACEPROGRESS)pInterface->pCallbacks;
     704    pInterfaceProgress = (PVDINTERFACEPROGRESS)pInterface->pCallbacks;
    700705
    701706    /* Do basic checks. */
    … …  
    772777DECLINLINE(PVDINTERFACECONFIG) VDGetInterfaceConfig(PVDINTERFACE pInterface)
    773778{
     779    PVDINTERFACECONFIG pInterfaceConfig;
     780
    774781    /* Check that the interface descriptor is a config interface. */
    775782    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_CONFIG)
    … …  
    777784                    ("Not a config interface"), NULL);
    778785
    779     PVDINTERFACECONFIG pInterfaceConfig = (PVDINTERFACECONFIG)pInterface->pCallbacks;
     786    pInterfaceConfig = (PVDINTERFACECONFIG)pInterface->pCallbacks;
    780787
    781788    /* Do basic checks. */
    … …  
    977984    if (RT_SUCCESS(rc))
    978985    {
     986        char *pbData;
    979987        Assert(cb);
    980988
    981         char *pvData = (char *)RTMemAlloc(cb);
    982         if (pvData)
     989        pbData = (char *)RTMemAlloc(cb);
     990        if (pbData)
    983991        {
    984             rc = pCfgIf->pfnQuery(pvUser, pszName, pvData, cb);
     992            rc = pCfgIf->pfnQuery(pvUser, pszName, pbData, cb);
    985993            if (RT_SUCCESS(rc))
    986994            {
    987                 *ppvData = pvData;
     995                *ppvData = pbData;
    988996                *pcbData = cb - 1; /* Exclude terminator of the queried string. */
    989997            }
    990998            else
    991                 RTMemFree(pvData);
     999                RTMemFree(pbData);
    9921000        }
    9931001        else
    … …  
    11231131DECLINLINE(PVDINTERFACETCPNET) VDGetInterfaceTcpNet(PVDINTERFACE pInterface)
    11241132{
     1133    PVDINTERFACETCPNET pInterfaceTcpNet;
     1134
    11251135    /* Check that the interface descriptor is a TCP network stack interface. */
    11261136    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_TCPNET)
    … …  
    11281138                    ("Not a TCP network stack interface"), NULL);
    11291139
    1130     PVDINTERFACETCPNET pInterfaceTcpNet = (PVDINTERFACETCPNET)pInterface->pCallbacks;
     1140    pInterfaceTcpNet = (PVDINTERFACETCPNET)pInterface->pCallbacks;
    11311141
    11321142    /* Do basic checks. */
    … …  
    11811191DECLINLINE(PVDINTERFACEPARENTSTATE) VDGetInterfaceParentState(PVDINTERFACE pInterface)
    11821192{
     1193    PVDINTERFACEPARENTSTATE pInterfaceParentState;
     1194
    11831195    /* Check that the interface descriptor is a parent state interface. */
    11841196    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_PARENTSTATE)
    … …  
    11861198                    ("Not a parent state interface"), NULL);
    11871199
    1188     PVDINTERFACEPARENTSTATE pInterfaceParentState = (PVDINTERFACEPARENTSTATE)pInterface->pCallbacks;
     1200    pInterfaceParentState = (PVDINTERFACEPARENTSTATE)pInterface->pCallbacks;
    11891201
    11901202    /* Do basic checks. */
    … …  
    12601272DECLINLINE(PVDINTERFACETHREADSYNC) VDGetInterfaceThreadSync(PVDINTERFACE pInterface)
    12611273{
     1274    PVDINTERFACETHREADSYNC pInterfaceThreadSync;
     1275
    12621276    /* Check that the interface descriptor is a thread synchronization interface. */
    12631277    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_THREADSYNC)
    … …  
    12651279                    ("Not a thread synchronization interface"), NULL);
    12661280
    1267     PVDINTERFACETHREADSYNC pInterfaceThreadSync = (PVDINTERFACETHREADSYNC)pInterface->pCallbacks;
     1281    pInterfaceThreadSync = (PVDINTERFACETHREADSYNC)pInterface->pCallbacks;
    12681282
    12691283    /* Do basic checks. */
    … …  
    16421656DECLINLINE(PVDINTERFACEIO) VDGetInterfaceIO(PVDINTERFACE pInterface)
    16431657{
     1658    PVDINTERFACEIO pInterfaceIO;
     1659
    16441660    /* Check that the interface descriptor is a async I/O interface. */
    16451661    AssertMsgReturn(   (pInterface->enmInterface == VDINTERFACETYPE_IO)
    … …  
    16471663                    ("Not an I/O interface"), NULL);
    16481664
    1649     PVDINTERFACEIO pInterfaceIO = (PVDINTERFACEIO)pInterface->pCallbacks;
     1665    pInterfaceIO = (PVDINTERFACEIO)pInterface->pCallbacks;
    16501666
    16511667    /* Do basic checks. */

  • trunk/include/VBox/VBoxKeyboard.h

    r29654 r30788  
    11/** @file
    2  *
    3  * VBox frontends: Qt GUI ("VirtualBox"):
    4  * X11 keyboard driver interface
    5  *
     2 * Frontends/Common - X11 keyboard driver interface.
    63 */
    74
    … …  
    3128 */
    3229
    33 #ifndef __H_KEYBOARD
    34 #define __H_KEYBOARD
     30#ifndef ___VBox_VBoxKeyboard_h
     31#define ___VBox_VBoxKeyboard_h
    3532
    3633#include <X11/Xlib.h>
    … …  
    5350#endif
    5451
    55 #endif /* __H_KEYBOARD */
     52#endif
    5653

  • trunk/include/VBox/VBoxVideo.h

    r30566 r30788  
    469469#define VBOXVHWA_SD_PITCH               0x00000008
    470470#define VBOXVHWA_SD_PIXELFORMAT         0x00001000
    471 //#define VBOXVHWA_SD_REFRESHRATE       0x00040000
     471/*#define VBOXVHWA_SD_REFRESHRATE       0x00040000*/
    472472#define VBOXVHWA_SD_WIDTH               0x00000004
    473473
    … …  
    529529#define VBOXVHWA_CAPS2_WIDESURFACES                 0x00001000
    530530#define VBOXVHWA_CAPS2_COPYFOURCC                   0x00008000
    531 //#define VBOXVHWA_CAPS2_FLIPINTERVAL                 0x00200000
    532 //#define VBOXVHWA_CAPS2_FLIPNOVSYNC                  0x00400000
     531/*#define VBOXVHWA_CAPS2_FLIPINTERVAL                 0x00200000*/
     532/*#define VBOXVHWA_CAPS2_FLIPNOVSYNC                  0x00400000*/
    533533
    534534
    … …  
    10621062 * while keeping this flag unchanged */
    10631063#define VBOXSHGSMI_FLAG_HG_ASYNCH               0x00010000
    1064 ///* if set     - asynch completion is performed by issuing the event,
    1065 // * if cleared - asynch completion is performed by calling a callback */
    1066 //#define VBOXSHGSMI_FLAG_GH_ASYNCH_EVENT         0x00000001
     1064#if 0
     1065/* if set     - asynch completion is performed by issuing the event,
     1066 * if cleared - asynch completion is performed by calling a callback */
     1067#define VBOXSHGSMI_FLAG_GH_ASYNCH_EVENT         0x00000001
     1068#endif
    10671069/* issue interrupt on asynch completion, used for critical G->H commands,
    10681070 * i.e. for completion of which guest is waiting. */
    … …  
    11631165} VBOXVDMA_SURF_DESC, *PVBOXVDMA_SURF_DESC;
    11641166
    1165 //typedef uint64_t VBOXVDMAPHADDRESS;
     1167/*typedef uint64_t VBOXVDMAPHADDRESS;*/
    11661168typedef uint64_t VBOXVDMASURFHANDLE;
    11671169

  • trunk/include/VBox/VDEPlugSymDefs.h

    r29461 r30788  
    2626#include <stddef.h>
    2727#include <sys/types.h>
     28
    2829/** Opaque connection type */
    2930struct vdeconn;
    … …  
    3435struct vde_open_args
    3536{
    36     /** The port of the switch to connect to */
     37    /** The port of the switch to connect to. */
    3738    int port;
    38     /** The group to set ownership of the port socket to */
     39    /** The group to set ownership of the port socket to. */
    3940    char *group;
    40     /** The file mode to set the port socket to */
     41    /** The file mode to set the port socket to. */
    4142    mode_t mode;
    4243};
    … …  
    5556               (vde_switch, descr, interface_version, open_args)) \
    5657 RT_PROXY_STUB(vde_recv, size_t, \
    57                (VDECONN *conn,void *buf,size_t len,int flags), \
     58               (VDECONN *conn, void *buf,size_t len, int flags), \
    5859               (conn, buf, len, flags)) \
    5960 RT_PROXY_STUB(vde_send, size_t, \
    60                (VDECONN *conn,const void *buf,size_t len,int flags), \
     61               (VDECONN *conn, const void *buf, size_t len, int flags), \
    6162               (conn, buf, len, flags)) \
    6263 RT_PROXY_STUB(vde_datafd, int, (VDECONN *conn), (conn)) \
    … …  
    7475# undef RT_RUNTIME_LOADER_GENERATE_BODY_STUBS
    7576#else
    76 # error This file should only be included to generate stubs for loading the \
    77 libvdeplug library at runtime
     77# error This file should only be included to generate stubs for loading the libvdeplug library at runtime
    7878#endif
    7979
    8080#undef RT_RUNTIME_LOADER_LIB_NAME
    8181#undef RT_RUNTIME_LOADER_INSERT_SYMBOLS
     82

  • trunk/include/VBox/cpum.h

    r30263 r30788  
    8181 * CPU context core.
    8282 */
     83#ifndef VBOX_WITHOUT_UNNAMED_UNIONS
    8384#pragma pack(1)
    8485typedef struct CPUMCTXCORE
    … …  
    181182} CPUMCTXCORE;
    182183#pragma pack()
     184#else  /* VBOX_WITHOUT_UNNAMED_UNIONS */
     185typedef struct CPUMCTXCORE CPUMCTXCORE;
     186#endif /* VBOX_WITHOUT_UNNAMED_UNIONS */
    183187
    184188
    … …  
    186190 * CPU context.
    187191 */
    188 #pragma pack(1)
     192#ifndef VBOX_WITHOUT_UNNAMED_UNIONS
     193# pragma pack(1)
    189194typedef struct CPUMCTX
    190195{
    … …  
    348353    /** @} */
    349354
    350 #if 0
     355# if 0
    351356    /** Padding to align the size on a 64 byte boundrary. */
    352357    uint32_t        padding[6];
    353 #endif
     358# endif
    354359} CPUMCTX;
    355 #pragma pack()
     360# pragma pack()
     361#else  /* VBOX_WITHOUT_UNNAMED_UNIONS */
     362typedef struct CPUMCTX CPUMCTX;
     363#endif /* VBOX_WITHOUT_UNNAMED_UNIONS */
    356364
    357365/**
    … …  
    379387 * @remarks PATM uses this, which is why it has to be here.
    380388 */
    381 #pragma pack(1)
     389#ifndef VBOX_WITHOUT_UNNAMED_UNIONS
     390# pragma pack(1)
    382391typedef struct CPUMCTX_VER1_6
    383392{
    … …  
    541550} CPUMCTX_VER1_6;
    542551#pragma pack()
     552#else  /* VBOX_WITHOUT_UNNAMED_UNIONS */
     553typedef struct CPUMCTX_VER1_6 CPUMCTX_VER1_6;
     554#endif /* VBOX_WITHOUT_UNNAMED_UNIONS */
    543555
    544556/**
    … …  
    725737VMMDECL(bool)       CPUMIsGuestInPAEMode(PVMCPU pVCpu);
    726738
     739#ifndef VBOX_WITHOUT_UNNAMED_UNIONS
     740
    727741/**
    728742 * Tests if the guest is running in real mode or not.
    … …  
    800814            &&  !CPUMIsGuestInLongModeEx(pCtx));
    801815}
     816
     817#endif /* VBOX_WITHOUT_UNNAMED_UNIONS */
    802818
    803819/** @} */

  • trunk/include/VBox/em.h

    r30338 r30788  
    158158VMMDECL(bool)       EMShouldContinueAfterHalt(PVMCPU pVCpu, PCPUMCTX pCtx);
    159159
    160 /* Wrap EMInterpretInstructionCPUEx for supervisor code only interpretation.
    161  */
    162 inline int EMInterpretInstructionCPU(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDISState, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
     160/**
     161 * Wrap EMInterpretInstructionCPUEx for supervisor code only interpretation.
     162 */
     163DECLINLINE(int) EMInterpretInstructionCPU(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDISState, PCPUMCTXCORE pRegFrame,
     164                                          RTGCPTR pvFault, uint32_t *pcbSize)
    163165{
    164166    return EMInterpretInstructionCPUEx(pVM, pVCpu, pDISState, pRegFrame, pvFault, pcbSize, EMCODETYPE_SUPERVISOR);

  • trunk/include/VBox/patm.h

    r28800 r30788  
    7272typedef struct PATMGCSTATE
    7373{
    74     // Virtual Flags register (IF + more later on)
     74    /* Virtual Flags register (IF + more later on) */
    7575    uint32_t  uVMFlags;
    7676
    … …  
    7878    uint32_t  uPendingAction;
    7979
    80     // Records the number of times all patches are called (indicating how many exceptions we managed to avoid)
     80    /* Records the number of times all patches are called (indicating how many exceptions we managed to avoid) */
    8181    uint32_t  uPatchCalls;
    82     // Scratchpad dword
     82    /* Scratchpad dword */
    8383    uint32_t  uScratch;
    84     // Debugging info
     84    /* Debugging info */
    8585    uint32_t  uIretEFlags, uIretCS, uIretEIP;
    8686
    … …  
    110110typedef struct PATMTRAPREC
    111111{
    112     // pointer to original guest code instruction (for emulation)
     112    /* pointer to original guest code instruction (for emulation) */
    113113    RTRCPTR pNewEIP;
    114     // pointer to the next guest code instruction
     114    /* pointer to the next guest code instruction */
    115115    RTRCPTR pNextInstr;
    116     //pointer to the corresponding next instruction in the patch block
     116    /* pointer to the corresponding next instruction in the patch block */
    117117    RTRCPTR pNextPatchInstr;
    118118} PATMTRAPREC, *PPATMTRAPREC;

  • trunk/include/VBox/pgm.h

    r30493 r30788  
    44
    55/*
    6  * Copyright (C) 2006-2007 Oracle Corporation
     6 * Copyright (C) 2006-2010 Oracle Corporation
    77 *
    88 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3232#include <VBox/vmapi.h>
    3333#include <VBox/x86.h>
    34 #include <VBox/hwacc_vmx.h>
    35 #include <VBox/VMMDev.h> /* for VMMDEVSHAREDREGIONDESC */
    36 #include <VBox/gmm.h> /* for PGMMREGISTERSHAREDMODULEREQ */
     34#include <VBox/VMMDev.h>                /* for VMMDEVSHAREDREGIONDESC */
     35#include <VBox/gmm.h>                   /* for PGMMREGISTERSHAREDMODULEREQ */
    3736#include <VBox/feature.h>
    3837

  • trunk/include/VBox/vusb.h

    r30653 r30788  
    3333# include "runtime.h"
    3434#endif
     35
     36struct PDMLED;
    3537
    3638RT_C_DECLS_BEGIN

  • trunk/include/iprt/table.h

    r28800 r30788  
    422422DECLINLINE(void) RTTabDestroy(PRTTAB pTab)
    423423{
    424     return pTab->pOps->pfnDestroy(pTab);
     424    pTab->pOps->pfnDestroy(pTab);
    425425}
    426426
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