VirtualBox

Changeset 68675 in vbox


Ignore:
Timestamp:
Sep 6, 2017 10:08:59 AM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
117906
Message:

include file build fixes (kmk -C include)

Location:
trunk
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/Makefile.kmk

    r68670 r68675  
    2828        VBox/HostServices/GuestControlSvc.h \
    2929        VBox/HostServices/DragAndDropSvc.h \
     30        VBox/HostServices/Service.h \
     31        VBox/GuestHost/GuestControl.h \
     32        VBox/GuestHost/DragAndDrop.h \
    3033        VBox/VBoxCrHgsmi.h \
    3134        VBox/VBoxUhgsmi.h \
    3235       VBox/dbus.h \
    33        VBox/VBoxPktDmp.h
     36       VBox/VBoxPktDmp.h \
     37       $(wildcard iprt/cpp/*)
    3438
    3539# Omit headers that are C++ and ring-3.
    … …  
    5054        VBox/VBoxUhgsmi.h \
    5155        VBox/VBoxNetCfg-win.h \
     56        VBox/VBoxDrvCfg-win.h \
    5257        VBox/dbus.h \
     58        $(if-expr "$(KBUILD_TARGET)" == "win",VBox/usblib.h,) \
    5359        VBox/usblib-win.h \
    5460        VBox/vd.h \
    … …  
    6268        VBox/vmm/uvm.h \
    6369        VBox/vscsi.h \
    64         $(wildcard VBox/ExtPack/*.h ) \
    65         $(wildcard iprt/win/*.h ) \
     70        VBox/ExtPack/% \
     71        VBox/GuestHost/DragAndDrop.h \
     72        VBox/HostServices/Service.h \
     73        iprt/win/% \
    6674        iprt/alloca.h \
    6775        iprt/tcp.h \
    6876        iprt/localipc.h \
    6977        iprt/linux/sysfs.h \
    70         iprt/socket.h
     78        iprt/socket.h \
     79        iprt/udp.h
    7180
    7281# Ring-0 only headers.
    … …  
    7483        VBox/VBoxGuestLibSharedFolders.h
    7584
    76 # We omit a few headers which have platform specific issues or are templates.
    77 hdrs := $(filter-out \
     85# GCC only headers.
     86gcc_only_hdrs := \
     87        iprt/nocrt/fenv.h \
     88        iprt/nocrt/math.h
     89
     90# Headers to omit all together.
     91omit_hdrs := \
    7892        VBox/HostServices/glext.h \
    7993        VBox/HostServices/glxext.h \
    … …  
    89103                VBox/VBoxNetCfg-win.h \
    90104                VBox/usblib-win.h \
    91         ,) \
     105        ,$(gcc_only_hdrs)) \
    92106        \
    93107        VBox/dbus-calls.h \
    … …  
    96110        iprt/runtime-loader.h \
    97111        iprt/mangling.h \
    98         \
     112       $(wildcard iprt/asm*watcom*.h) \
     113       iprt/asn1-generator% \
     114       iprt/win/% \
     115       iprt/nt/% \
     116       \
    99117        $(foreach os,$(filter-out $(KBUILD_TARGET),$(KBUILD_OSES)),iprt/$(os)/% VBox/$(os)/%) \
    100         $(xforeach arch,$(KBUILD_ARCHES),iprt/nocrt/$(arch)/%) \
    101         , $(wildcard VBox/*.h VBox/*/*.h iprt/*.h iprt/*/*.h))
     118        $(foreach arch,$(KBUILD_ARCHES),iprt/nocrt/$(arch)/%)
     119
     120# We omit a few headers which have platform specific issues or are templates.
     121hdrs := $(filter-out $(omit_hdrs), $(wildcard VBox/*.h VBox/*/*.h iprt/*.h iprt/*/*.h))
    102122
    103123# ring-3, ring-0 and raw-mode context specific exclusions.
    … …  
    113133        iprt/memsafer.h \
    114134        iprt/alloc.h \
     135        iprt/vector.h \
    115136        $(r3_cpp_hdrs) \
    116137        $(r3_only_hdrs) \
    … …  
    118139        , $(hdrs))
    119140hdrs-c.rc := $(filter-out $(cpp_features_hdrs), $(hdrs.rc))
     141#$(error $(subst $(SP),$(NLTAB),$(strip $(sort $(hdrs-c.rc)))))
    120142
    121143SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
    … …  
    147169
    148170
     171# Headers that must only be included once.
     172only_once_hdrs := \
     173        iprt/bldprog-strtab-template.cpp.h
     174
    149175define def_hdr
    150176$(eval flatname := $(subst /,_,$(basename $(hdr))))
     177$(eval functioname := $(translate $(flatname),-./,___))
    151178$$(PATH_TARGET)/$(flatname)-cpp.cpp: $(VBOX_ROOT_INCLUDE_MAKEFILE) | $$(PATH_TARGET)/
    152         $(QUIET)$$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
     179        $(QUIET)$$(APPEND) -t -n $$@ \
     180                '#include <$(hdr)>' \
     181                $(if-expr $(intersects $(hdr),$(only_once_hdrs)),, '#include <$(hdr)>') \
     182                'extern int $(functioname)_cpp(void);' \
     183                'int $(functioname)_cpp(void) { return 0;}'
    153184
    154185$$(PATH_TARGET)/$(flatname)-c.c: $(VBOX_ROOT_INCLUDE_MAKEFILE) | $$(PATH_TARGET)/
    155         $(QUIET)$$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
     186        $(QUIET)$$(APPEND) -t -n $$@ \
     187                '#include <$(hdr)>' \
     188                $(if-expr $(intersects $(hdr),$(only_once_hdrs)),, '#include <$(hdr)>') \
     189                'extern int $(functioname)_c(void);' \
     190                'int $(functioname)_c(void) { return 0;}'
    156191
    157192$(subst .h,.o,$(notdir $(hdr)))::

  • trunk/include/VBox/GuestHost/DragAndDrop.h

    r59855 r68675  
    232232    uint64_t                m_cbTotal;
    233233};
    234 #endif /* ___VBox_GuestHost_DragAndDrop_h */
    235 
     234
     235#endif /* !___VBox_GuestHost_DragAndDrop_h */
     236

  • trunk/include/VBox/GuestHost/GuestControl.h

    r61893 r68675  
    2727#ifndef ___VBox_GuestHost_GuestControl_h
    2828#define ___VBox_GuestHost_GuestControl_h
     29
     30#include <iprt/types.h>
    2931
    3032/* Everything defined in this file lives in this namespace. */

  • trunk/include/VBox/HostServices/VBoxClipboardSvc.h

    r68660 r68675  
    7575 * HGCM parameter structures.
    7676 */
    77 #pragma pack (1)
     77#pragma pack(1)
    7878typedef struct _VBoxClipboardGetHostMsg
    7979{
    … …  
    131131#define VBOX_SHARED_CLIPBOARD_CPARMS_WRITE_DATA 2
    132132
    133 #pragma pack ()
     133#pragma pack()
    134134
    135135#endif

  • trunk/include/VBox/HostServices/VBoxOGLOp.h

    r62476 r68675  
    2828#define ___VBox_HostService_VBoxOGLOp_h
    2929
     30#include <iprt/types.h>
     31
    3032#ifdef VBOX_OGL_GUEST_SIDE
    3133/************************************************************************************************************
    … …  
    517519    }
    518520
    519 #elif VBOX_OGL_HOST_SIDE
     521#elif defined(VBOX_OGL_HOST_SIDE)
    520522
    521523/************************************************************************************************************

  • trunk/include/VBox/RemoteDesktop/VRDEInput.h

    r62476 r68675  
    2727#define ___VBox_RemoteDesktop_VRDEInput_h
    2828
     29#include <VBox/RemoteDesktop/VRDE.h>
    2930
    3031/*

  • trunk/include/VBox/RemoteDesktop/VRDEVideoIn.h

    r62476 r68675  
    3131
    3232#ifdef VRDE_VIDEOIN_WITH_VRDEINTERFACE
    33 #include <VBox/RemoteDesktop/VRDE.h>
     33# include <VBox/RemoteDesktop/VRDE.h>
    3434#endif /* VRDE_VIDEOIN_WITH_VRDEINTERFACE */
    3535
    3636#ifdef AssertCompileSize
    37 #define ASSERTSIZE(type, size) AssertCompileSize(type, size);
     37# define ASSERTSIZE(type, size) AssertCompileSize(type, size);
    3838#else
    39 #define ASSERTSIZE(type, size)
     39# define ASSERTSIZE(type, size)
    4040#endif /* AssertCompileSize */
     41
     42#include <iprt/types.h>
    4143
    4244

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

    r62476 r68675  
    294294    })
    295295#else
    296 #define CHECK_PROGRESS_ERROR_BREAK(progress, msg) \
     296# define CHECK_PROGRESS_ERROR_BREAK(progress, msg) \
    297297    if (1) \
    298298    { \
    … …  
    342342    } while (0)
    343343
    344 #endif
    345344
    346345/**
    … …  
    362361} /* namespace com */
    363362
     363
    364364/** @} */
    365365
     366#endif
     367

  • trunk/include/VBox/vmm/cpumctx-v1_6.h

    r62476 r68675  
    2828
    2929#include <iprt/x86.h>
     30#include <VBox/vmm/cpumctx.h>
    3031
    3132

  • trunk/include/VBox/vmm/cpumctx.h

    r68405 r68675  
    597597AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvIoBitmapR3,           HC_ARCH_BITS == 64 ? 976 : 964);
    598598AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.HCPhysVmcb,             HC_ARCH_BITS == 64 ? 984 : 968);
    599 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) fLocalForcedActions,        992);
     599AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions,        992);
    600600AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pVmcbR0,       8);
    601601AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR0, 8);

  • trunk/include/VBox/vmm/dbgfcorefmt.h

    r62476 r68675  
    6262    uint16_t        uReserved0;
    6363    uint32_t        uReserved1;
    64 } VBOXX86SEL;
     64} DBGFCORESEL;
    6565AssertCompileSizeAlignment(DBGFCORESEL, 8);
    6666
    … …  
    7373    uint32_t        cb;
    7474    uint32_t        uReserved0;
    75 } DBGFXDTR;
    76 AssertCompileSizeAlignment(DBGFCORESEL, 8);
     75} DBGFCOREXDTR;
     76AssertCompileSizeAlignment(DBGFCOREXDTR, 8);
    7777
    7878/**
    … …  
    115115    DBGFCOREXDTR        gdtr;
    116116    DBGFCOREXDTR        idtr;
    117     VBOXX86SEL          ldtr;
    118     VBOXX86SEL          tr;
     117    DBGFCORESEL         ldtr;
     118    DBGFCORESEL         tr;
    119119    struct
    120120    {

  • trunk/include/VBox/vmm/pdmaudioifs.h

    r68485 r68675  
    884884} PDMAUDIOSTREAMOUT, *PPDMAUDIOSTREAMOUT;
    885885
    886 struct PDMAUDIOSTREAM;
    887 typedef PDMAUDIOSTREAM *PPDMAUDIOSTREAM;
     886typedef struct PDMAUDIOSTREAM *PPDMAUDIOSTREAM;
    888887
    889888/**

  • trunk/include/VBox/vmm/pdmnetinline.h

    r63267 r68675  
    2626 * terms and conditions of either the GPL or the CDDL or both.
    2727 */
     28
     29#ifndef ___VBox_vmm_pdmnetinline_h_
     30#define ___VBox_vmm_pdmnetinline_h_
    2831
    2932
    … …  
    3740#include <iprt/net.h>
    3841#include <iprt/string.h>
    39 
    4042
    4143
    … …  
    670672/** @} */
    671673
     674#endif
     675

  • trunk/include/VBox/vmm/pdmstorageifs.h

    r66193 r68675  
    3232
    3333RT_C_DECLS_BEGIN
     34
     35struct PDMISECKEY;
     36struct PDMISECKEYHLP;
     37
    3438
    3539/** @defgroup grp_pdm_ifs_storage       PDM Storage Interfaces
    … …  
    327331     * @thread  Any thread.
    328332     */
    329     DECLR3CALLBACKMEMBER(int, pfnSetSecKeyIf,(PPDMIMEDIA pInterface, PPDMISECKEY pIfSecKey,
    330                                               PPDMISECKEYHLP pIfSecKeyHlp));
     333    DECLR3CALLBACKMEMBER(int, pfnSetSecKeyIf,(PPDMIMEDIA pInterface, struct PDMISECKEY *pIfSecKey,
     334                                              struct PDMISECKEYHLP *pIfSecKeyHlp));
    331335
    332336    /**

  • trunk/include/iprt/bldprog-strtab-template.cpp.h

    r66823 r68675  
    901901        else
    902902            fprintf(pOut, "\\x%02", (unsigned)uch);
     903        NOREF(pThis);
    903904#endif
    904905    }

  • trunk/include/iprt/cpp/meta.h

    r62474 r68675  
    2626#ifndef ___iprt_cpp_meta_h
    2727#define ___iprt_cpp_meta_h
     28
     29#include <iprt/types.h>
    2830
    2931/** @defgroup grp_rt_cpp_meta   C++ Meta programming utilities

  • trunk/include/iprt/cpp/utils.h

    r62474 r68675  
    2626#ifndef ___iprt_cpputils_h
    2727#define ___iprt_cpputils_h
     28
     29#include <iprt/types.h>
    2830
    2931/** @defgroup grp_rt_cpp        IPRT C++ APIs */

  • trunk/include/iprt/crypto/pkcs7.h

    r64883 r68675  
    3232
    3333RT_C_DECLS_BEGIN
     34
     35struct RTCRPKCS7CONTENTINFO;
     36
    3437
    3538/** @defgroup grp_rt_crpkcs7 RTCrPkcs7 - PKCS \#7, Cryptographic Message Syntax Standard (aka CMS).

  • trunk/include/iprt/crypto/x509.h

    r62474 r68675  
    3232
    3333RT_C_DECLS_BEGIN
     34
     35struct RTCRPKCS7SETOFCERTS;
    3436
    3537

  • trunk/include/iprt/formats/xar.h

    r62474 r68675  
    2828#define ___iprt_formats_xar_h
    2929
     30#include <iprt/types.h>
     31
     32
     33/** @defgroup grp_rt_formats_xar   Extensible Archive (XAR) format
     34 * @ingroup grp_rt_formats
     35 *
     36 * @{ */
    3037
    3138#pragma pack(4) /* Misdesigned header, not 8-byte aligned size. */
    … …  
    6471/** @} */
    6572
     73/** @} */
    6674
    6775#endif

  • trunk/include/iprt/krnlmod.h

    r67287 r68675  
    6262 * @returns Number of kernel modules loaded.
    6363 */
    64 RTDECL(uint32_t) RTKrnlModLoadedGetCount();
     64RTDECL(uint32_t) RTKrnlModLoadedGetCount(void);
    6565
    6666/**

  • trunk/include/iprt/runtime-loader.h

    r62473 r68675  
    156156 * RT_RUNTIME_LOADER_LIB_NAME */
    157157#  define RT_PROXY_STUB(function, rettype, signature, shortsig) \
    158     RTR3DECL(rettype) ( function ) signature ;
     158    RTR3DECL(rettype)  function signature ;
    159159
    160160RT_RUNTIME_LOADER_INSERT_SYMBOLS

  • trunk/src/VBox/Runtime/r3/darwin/krnlmod-darwin.cpp

    r67284 r68675  
    164164
    165165
    166 RTDECL(uint32_t) RTKrnlModLoadedGetCount()
     166RTDECL(uint32_t) RTKrnlModLoadedGetCount(void)
    167167{
    168168    uint32_t cLoadedKexts = 0;
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