Changeset 3699 in vbox

Timestamp:

Jul 18, 2007 5:37:46 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22991

Message:

double underscore cleanup.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/dir.h (modified) (1 diff)
• include/internal/file.h (modified) (1 diff)
• include/internal/fs.h (modified) (1 diff)
• include/internal/initterm.h (modified) (1 diff)
• include/internal/ldr.h (modified) (1 diff)
• include/internal/ldrELF32.h (modified) (1 diff)
• include/internal/ldrELF64.h (modified) (1 diff)
• include/internal/ldrELFAmd64.h (modified) (1 diff)
• include/internal/ldrELFCommon.h (modified) (1 diff)
• include/internal/ldrELFi386.h (modified) (1 diff)
• include/internal/ldrMZ.h (modified) (1 diff)
• include/internal/ldrPE.h (modified) (1 diff)
• include/internal/magics.h (modified) (2 diffs)
• include/internal/memobj.h (modified) (1 diff)
• include/internal/path.h (modified) (1 diff)
• include/internal/process.h (modified) (1 diff)
• include/internal/rand.h (modified) (2 diffs)
• include/internal/sched.h (modified) (1 diff)
• include/internal/string.h (modified) (1 diff)
• include/internal/thread.h (modified) (1 diff)
• include/internal/time.h (modified) (1 diff)
• r0drv/alloc-r0drv.h (modified) (1 diff)
• r0drv/darwin/the-darwin-kernel.h (modified) (1 diff)
• r0drv/linux/string.h (modified) (1 diff)
• r0drv/linux/the-linux-kernel.h (modified) (2 diffs)
• r0drv/nt/the-nt-kernel.h (modified) (2 diffs)
• r0drv/os2/the-os2-kernel.h (modified) (1 diff)
• r3/alloc-ef.h (modified) (1 diff)
• r3/win32/process-win32.cpp (modified) (2 diffs)
• testcase/ioctl.h (modified) (2 diffs)

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

@@ -20 +20 @@
  */
 
-
-#ifndef __internal_dir_h__
-#define __internal_dir_h__
+#ifndef ___internal_dir_h
+#define ___internal_dir_h
 
 #include <iprt/cdefs.h>

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

@@ -20 +20 @@
  */
 
-
-#ifndef __internal_file_h__
-#define __internal_file_h__
+#ifndef ___internal_file_h
+#define ___internal_file_h
 
 #include <iprt/file.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __fs_h__
-#define __fs_h__
+#ifndef ___internal_fs_h
+#define ___internal_fs_h
 
 #include <iprt/types.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __internal_initterm_h_
-#define __internal_initterm_h_
+#ifndef ___internal_initterm_h
+#define ___internal_initterm_h
 
 #include <iprt/cdefs.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __ldr_h__
-#define __ldr_h__
+#ifndef ___internal_ldr_h
+#define ___internal_ldr_h
 
 #include <iprt/types.h>

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

@@ -25 +25 @@
  */
 
-#ifndef __ldrELF32_h__
-#define __ldrELF32_h__
+#ifndef ___internal_ldrELF32_h
+#define ___internal_ldrELF32_h
 
 #include "ldrELFCommon.h"

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

@@ -25 +25 @@
  */
 
-#ifndef __ldrELF64_h__
-#define __ldrELF64_h__
+#ifndef ___internal_ldrELF64_h
+#define ___internal_ldrELF64_h
 
 #include "ldrELFCommon.h"

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

@@ -25 +25 @@
  */
 
-#ifndef __ldrELFAmd64_h__
-#define __ldrELFAmd64_h__
+#ifndef ___internal_ldrELFAmd64_h
+#define ___internal_ldrELFAmd64_h
 
 /*

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

@@ -25 +25 @@
  */
 
-#ifndef __ldrELFCommon_h__
-#define __ldrELFCommon_h__
+#ifndef ___internal_ldrELFCommon_h
+#define ___internal_ldrELFCommon_h
 
 #include <iprt/stdint.h>

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

@@ -25 +25 @@
  */
 
-#ifndef __ldrELFi386_h__
-#define __ldrELFi386_h__
+#ifndef ___internal_ldrELFi386_h
+#define ___internal_ldrELFi386_h
 
 #if 0  /* later */

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

@@ -20 +20 @@
  */
 
-#ifndef __ldrMZ_h__
-#define __ldrMZ_h__
+#ifndef ___internal_ldrMZ_h
+#define ___internal_ldrMZ_h
 
 #pragma pack(1) /* not required */

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

@@ -20 +20 @@
  */
 
-#ifndef __ldrPE_h__
-#define __ldrPE_h__
+#ifndef ___internal_ldrPE_h
+#define ___internal_ldrPE_h
 
 #include <iprt/types.h>

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

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 innotek GmbH
- *
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +21 @@
  */
 
-#ifndef ___internal_magics_h___
-#define ___internal_magics_h___
+#ifndef ___internal_magics_h
+#define ___internal_magics_h
 
-/** @name Magic Numbers. 
+/** @name Magic Numbers.
  * @{ */
 

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

@@ -20 +20 @@
  */
 
-#ifndef __internal_memobj_h__
-#define __internal_memobj_h__
+#ifndef ___internal_memobj_h
+#define ___internal_memobj_h
 
 #include <iprt/memobj.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __path_h__
-#define __path_h__
+#ifndef ___internal_path_h
+#define ___internal_path_h
 
 #include <iprt/cdefs.h>

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

@@ -20 +20 @@
  */
 
-
-#ifndef __internal_process_h__
-#define __internal_process_h__
+#ifndef ___internal_process_h
+#define ___internal_process_h
 
 #include <iprt/process.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __internal_rand_h__
-#define __internal_rand_h__
+#ifndef ___internal_rand_h
+#define ___internal_rand_h
 
 #include <iprt/types.h>
@@ -34 +34 @@
 /**
  * Generate random bytes using OS facilities.
- * 
+ *
  * @returns VINF_SUCCESS on success, some error status code on failure.
  * @param   pv      Where to store the random bytes.

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

@@ -20 +20 @@
  */
 
-
-#ifndef __internal_sched_h__
-#define __internal_sched_h__
+#ifndef ___internal_sched_h
+#define ___internal_sched_h
 
 #include <iprt/thread.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __internal_string_h__
-#define __internal_string_h__
+#ifndef ___internal_string_h
+#define ___internal_string_h
 
 #include <iprt/string.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __thread_h__
-#define __thread_h__
+#ifndef ___thread_h
+#define ___thread_h
 
 #include <iprt/types.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __internal_time_h__
-#define __internal_time_h__
+#ifndef ___internal_time_h
+#define ___internal_time_h
 
 #include <iprt/types.h>

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.h

@@ -20 +20 @@
  */
 
-#ifndef __r0drv_alloc_r0drv_h__
-#define __r0drv_alloc_r0drv_h__
+#ifndef ___r0drv_alloc_r0drv_h
+#define ___r0drv_alloc_r0drv_h
 
 #include <iprt/cdefs.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __the_darwin_kernel_h__
-#define __the_darwin_kernel_h__
+#ifndef ___the_darwin_kernel_h
+#define ___the_darwin_kernel_h
 
 /* Problematic header(s) containing conflicts with IPRT  first. */

trunk/src/VBox/Runtime/r0drv/linux/string.h

@@ -20 +20 @@
  */
 
-#ifndef __string_h__
-#define __string_h__
+#ifndef ___string_h
+#define ___string_h
 
 #include <iprt/cdefs.h>

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

@@ -20 +20 @@
  */
 
-#ifndef __the_linux_kernel_h__
-#define __the_linux_kernel_h__
-
-/* 
+#ifndef ___the_linux_kernel_h
+#define ___the_linux_kernel_h
+
+/*
  * Include iprt/types.h to install the bool wrappers.
  * Then use the linux bool type for all the stuff include here.
@@ -215 +215 @@
 #endif
 
-/* 
+/*
  * Stop using the linux bool type.
  */

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

@@ -20 +20 @@
  */
 
-#ifndef __the_nt_kernel_h__
-#define __the_nt_kernel_h__
+#ifndef ___the_nt_kernel_h
+#define ___the_nt_kernel_h
 
 #include <iprt/cdefs.h>
@@ -45 +45 @@
 
 #include <memory.h>
-#if !defined(__WIN32__) && !defined(__WIN64__)
-# error "__WIN32__ or __WIN64__ must be defined!"
-#endif
 #if !defined(RT_OS_WINDOWS)
 # error "RT_OS_WINDOWS must be defined!"

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

@@ -30 +30 @@
 
 
-#ifndef __the_os2_kernel_h__
-#define __the_os2_kernel_h__
+#ifndef ___the_os2_kernel_h
+#define ___the_os2_kernel_h
 
 #include <iprt/types.h>

trunk/src/VBox/Runtime/r3/alloc-ef.h

@@ -20 +20 @@
  */
 
-#ifndef __alloc_ef_h__
-#define __alloc_ef_h__
+#ifndef ___alloc_ef_h
+#define ___alloc_ef_h
 
 /*******************************************************************************

trunk/src/VBox/Runtime/r3/win32/process-win32.cpp

@@ -102 +102 @@
              * GetProcessId requires XP SP1 or later
              */
-#ifdef __WIN64__
+#if defined(RT_ARCH_AMD64)
             *pProcess = GetProcessId(hProcess);
-#else /* !__WIN64__ */
+#else /* !RT_ARCH_AMD64 */
             static bool           fInitialized = false;
             static DWORD (WINAPI *pfnGetProcessId)(HANDLE Thread) = NULL;
@@ -140 +140 @@
                 *pProcess = ProcInfo.UniqueProcessId;
             }
-#endif  /* !__WIN64__ */
+#endif  /* !RT_ARCH_AMD64 */
         }
         return VINF_SUCCESS;

trunk/src/VBox/Runtime/testcase/ioctl.h

@@ -20 +20 @@
  */
 
-#ifndef __VBOX_L4_OSS_IOCTL
-#define __VBOX_L4_OSS_IOCTL
+#ifndef ___VBOX_L4_OSS_IOCTL
+#define ___VBOX_L4_OSS_IOCTL
 
 #define IOCPARM_MASK   0x3fff          /* parameters must be < 16383 bytes */
@@ -40 +40 @@
 #define _IOC_WRITE     IOC_IN
 
-#endif /* __VBOX_L4_OSS_IOCTL */
+#endif /* !___VBOX_L4_OSS_IOCTL */