Changeset 76557 in vbox for trunk/src/VBox

Timestamp:

Jan 1, 2019 2:37:24 AM (6 years ago)

Author:

vboxsync

Message:

include/iprt: Use IPRT_INCLUDED_ rather than _iprt_ as header guard prefix, letting scm enforce this (thereby avoiding copy&paste errors like rsa.h).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h (modified) (1 diff)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibInternal.h (modified) (2 diffs)
• Additions/common/VBoxService/VBoxServiceInternal.h (modified) (1 diff)
• HostDrivers/Support/SUPLibInternal.h (modified) (1 diff)
• Main/cbinding/tstCAPIGlue.c (modified) (1 diff)
• Runtime/include/internal/path.h (modified) (1 diff)
• Runtime/include/internal/thread.h (modified) (1 diff)
• Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)
• Runtime/r3/win/internal-r3-win.h (modified) (1 diff)

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

@@ -50 +50 @@
     /** Pointer to the session handle. */
     void           *pvSession;
-# if defined(RT_OS_WINDOWS) && (defined(___iprt_nt_ntddk_h___) || defined(___iprt_nt_nt_h___))
+# if defined(RT_OS_WINDOWS) && (defined(IPRT_INCLUDED_nt_ntddk_h) || defined(IPRT_INCLUDED_nt_nt_h))
     /** Pointer to the NT device object. */
     PDEVICE_OBJECT  pDeviceObject;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibInternal.h

@@ -99 +99 @@
 
 
-#ifdef ___iprt_string_h
+#ifdef IPRT_INCLUDED_string_h
 
 DECLINLINE(void) VbglHGCMParmPtrSetString(HGCMFunctionParameter *pParm, const char *psz)
@@ -108 +108 @@
 }
 
-#endif /* ___iprt_string_h */
+#endif /* IPRT_INCLUDED_string_h */
 
 #ifdef VBOX_VBGLR3_XFREE86

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -214 +214 @@
 extern decltype(GetSystemTimeAdjustment)       *g_pfnGetSystemTimeAdjustment;
 extern decltype(SetSystemTimeAdjustment)       *g_pfnSetSystemTimeAdjustment;
-# ifdef ___iprt_nt_nt_h___
+# ifdef IPRT_INCLUDED_nt_nt_h
 extern decltype(ZwQuerySystemInformation)      *g_pfnZwQuerySystemInformation;
 # endif

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -466 +466 @@
 DECLHIDDEN(void)    supR3HardenedWinInitImports(void);
 DECLHIDDEN(void)    supR3HardenedWinModifyDllSearchPath(uint32_t fFlags, const char *pszAppBinPath);
-# ifdef ___iprt_nt_nt_h___
+# ifdef IPRT_INCLUDED_nt_nt_h
 DECLHIDDEN(void)    supR3HardenedWinGetVeryEarlyImports(uintptr_t uNtDllAddr,
                                                         PFNNTWAITFORSINGLEOBJECT *ppfnNtWaitForSingleObject,

trunk/src/VBox/Main/cbinding/tstCAPIGlue.c

@@ -40 +40 @@
 # include <sys/poll.h>
 #endif
-#ifdef ___iprt_cdefs_h
+#ifdef IPRT_INCLUDED_cdefs_h
 # error "not supposed to involve any IPRT or VBox headers here."
 #endif

trunk/src/VBox/Runtime/include/internal/path.h

@@ -135 +135 @@
 
 
-#if defined(RT_OS_WINDOWS) && defined(___iprt_fs_h) && defined(UNICODE_NULL)
+#if defined(RT_OS_WINDOWS) && defined(IPRT_INCLUDED_fs_h) && defined(UNICODE_NULL)
 DECLHIDDEN(int) rtPathNtQueryInfoWorker(HANDLE hRootDir, struct _UNICODE_STRING *pNtName, PRTFSOBJINFO pObjInfo,
                                         RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags, const char *pszPath);

trunk/src/VBox/Runtime/include/internal/thread.h

@@ -262 +262 @@
 #endif
 
-#ifdef ___iprt_asm_h
+#ifdef IPRT_INCLUDED_asm_h
 
 /**

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -431 +431 @@
  * There are some conflicting defines in iprt/param.h, sort them out here.
  */
-#ifndef ___iprt_param_h
+#ifndef IPRT_INCLUDED_param_h
 # undef PAGE_SIZE
 # undef PAGE_OFFSET_MASK

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -111 +111 @@
 typedef NTSTATUS (NTAPI *PFNNTDUPLICATETOKEN)(HANDLE, ACCESS_MASK, struct _OBJECT_ATTRIBUTES *, BOOLEAN, TOKEN_TYPE, PHANDLE);
 extern DECLHIDDEN(PFNNTDUPLICATETOKEN)             g_pfnNtDuplicateToken;
-#ifdef ___iprt_nt_nt_h___
+#ifdef IPRT_INCLUDED_nt_nt_h
 extern decltype(NtAlertThread)                    *g_pfnNtAlertThread;
 #endif