VirtualBox

Ignore:
Timestamp:
Sep 5, 2017 2:17:02 PM (7 years ago)
Author:
vboxsync
Message:

Merged VBGLInternal.h and VBoxGuestR0LibInternal.h into the latter.

Location:
trunk/src/VBox/Additions/common/VBoxGuest/lib
Files:
12 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibCrOgl.cpp

    r68550 r68645  
    3434*********************************************************************************************************************************/
    3535#include <iprt/string.h>
    36 #include "VBGLInternal.h"
     36#include "VBoxGuestR0LibInternal.h"
    3737
    3838

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp

    r68641 r68645  
    2525 */
    2626
    27 #include "VBGLInternal.h"
     27#include "VBoxGuestR0LibInternal.h"
    2828#include <iprt/asm.h>
    2929#include <iprt/asm-amd64-x86.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCM.cpp

    r68641 r68645  
    3434#ifndef VBGL_VBOXGUEST
    3535
    36 #include "VBGLInternal.h"
     36#include "VBoxGuestR0LibInternal.h"
    3737
    3838#include <iprt/assert.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp

    r68641 r68645  
    3434#define LOG_GROUP LOG_GROUP_HGCM
    3535
    36 #include "VBGLInternal.h"
     36#include "VBoxGuestR0LibInternal.h"
    3737#include <iprt/alloca.h>
    3838#include <iprt/asm.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-os2.cpp

    r68613 r68645  
    3030*********************************************************************************************************************************/
    3131#include "VBoxGuestR0LibInternal.h"
    32 #include <VBox/VBoxGuest.h>
    3332#include <VBox/err.h>
    3433#include <VBox/log.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-solaris.cpp

    r68635 r68645  
    11/* $Id$ */
    22/** @file
    3  * VBoxGuestLib - Ring-0 Support Library for VBoxGuest, IDC, UNIX-like OSes.
     3 * VBoxGuestLib - Ring-0 Support Library for VBoxGuest, IDC, Solaris specific.
    44 */
    55
    … …  
    2929*   Header Files                                                                                                                 *
    3030*********************************************************************************************************************************/
     31#include <sys/conf.h>
     32#include <sys/sunldi.h>
     33#include <sys/file.h>
     34#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
    3135#include "VBoxGuestR0LibInternal.h"
    32 #include <VBox/VBoxGuest.h>
    3336#include <VBox/err.h>
    3437

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-unix.cpp

    r68598 r68645  
    3030*********************************************************************************************************************************/
    3131#include "VBoxGuestR0LibInternal.h"
    32 #include <VBox/VBoxGuest.h>
    3332
    3433

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp

    r68641 r68645  
    2929*   Header Files                                                                                                                 *
    3030*********************************************************************************************************************************/
    31 #define VBGL_DECL_DATA
    32 #include "VBGLInternal.h"
     31#include "VBoxGuestR0LibInternal.h"
    3332
    3433#include <iprt/string.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h

    r68644 r68645  
    2525 */
    2626
    27 #ifndef ___VBoxGuestLib_VBGLInternal_h
    28 #define ___VBoxGuestLib_VBGLInternal_h
     27#ifndef ___VBoxGuestLib_VBoxGuestR0LibInternal_h
     28#define ___VBoxGuestLib_VBoxGuestR0LibInternal_h
     29
     30/*
     31 * Define the private IDC handle structure before we include the VBoxGuestLib.h header.
     32 */
     33#include <iprt/types.h>
     34#include <iprt/assert.h>
     35RT_C_DECLS_BEGIN
     36
     37# ifndef VBGL_VBOXGUEST
     38/**
     39 * The hidden part of VBGLIDCHANDLE.
     40 */
     41struct VBGLIDCHANDLEPRIVATE
     42{
     43    /** Pointer to the session handle. */
     44    void           *pvSession;
     45# if defined(RT_OS_WINDOWS) && (defined(___iprt_nt_ntddk_h___) || defined(___iprt_nt_nt_h___))
     46    /** Pointer to the NT device object. */
     47    PDEVICE_OBJECT  pDeviceObject;
     48    /** Pointer to the NT file object. */
     49    PFILE_OBJECT    pFileObject;
     50# elif defined(RT_OS_SOLARIS) && defined(_SPL_SUNLDI_H)
     51    /** LDI device handle to keep the device attached. */
     52    ldi_handle_t    hDev;
     53# endif
     54};
     55/** Indicate that the VBGLIDCHANDLEPRIVATE structure is present. */
     56# define VBGLIDCHANDLEPRIVATE_DECLARED 1
     57#endif
    2958
    3059#include <VBox/VMMDev.h>
    … …  
    3261#include <VBox/VBoxGuestLib.h>
    3362
     63#ifdef VBGLIDCHANDLEPRIVATE_DECLARED
     64AssertCompile(RT_SIZEOFMEMB(VBGLIDCHANDLE, apvPadding) >= sizeof(struct VBGLIDCHANDLEPRIVATE));
     65#endif
     66
     67
     68/*
     69 * Native IDC functions.
     70 */
     71int VBOXCALL vbglR0IdcNativeOpen(PVBGLIDCHANDLE pHandle, PVBGLIOCIDCCONNECT pReq);
     72int VBOXCALL vbglR0IdcNativeClose(PVBGLIDCHANDLE pHandle, PVBGLIOCIDCDISCONNECT pReq);
     73
     74
     75/*
     76 * Deprecated logging macro
     77 */
    3478#include <VBox/log.h>
    35 
    3679#ifdef RT_OS_WINDOWS /** @todo dprintf() -> Log() */
    3780# if (defined(DEBUG) && !defined(NO_LOGGING)) || defined(LOG_ENABLED)
    … …  
    5497# define VBGLDATA_USE_FAST_MUTEX
    5598#endif
    56 
    5799
    58100struct _VBGLPHYSHEAPBLOCK;
    … …  
    119161
    120162
    121 #ifndef VBGL_DECL_DATA
    122163extern VBGLDATA g_vbgldata;
    123 #endif
    124164
    125165/**
    … …  
    158198#endif
    159199
    160 #endif /* !___VBoxGuestLib_VBGLInternal_h */
    161 
     200RT_C_DECLS_END
     201
     202#endif /* !___VBoxGuestLib_VBoxGuestR0LibInternal_h */
     203

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibMouse.cpp

    r68641 r68645  
    2525 */
    2626
    27 #include "VBGLInternal.h"
     27#include "VBoxGuestR0LibInternal.h"
    2828
    2929/**

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp

    r68641 r68645  
    2525 */
    2626
    27 #include "VBGLInternal.h"
     27#include "VBoxGuestR0LibInternal.h"
    2828
    2929#include <iprt/assert.h>

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibVMMDev.cpp

    r68641 r68645  
    2525 */
    2626
    27 #include "VBGLInternal.h"
     27#include "VBoxGuestR0LibInternal.h"
    2828
    2929

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VbglR0CanUsePhysPageList.cpp

    r62521 r68645  
    2525 */
    2626
    27 #include "VBGLInternal.h"
     27#include "VBoxGuestR0LibInternal.h"
    2828
    2929
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