Changeset 3637 in vbox

Timestamp:

Jul 16, 2007 1:06:53 PM (18 years ago)

Author:

vboxsync

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

22908

Message:

LINUX -> RT_OS_LINUX.

Location:

trunk/include/iprt

Files:

• cdefs.h (modified) (2 diffs)
• mem.h (modified) (1 diff)
• spinlock.h (modified) (1 diff)
• stdint.h (modified) (3 diffs)
• string.h (modified) (1 diff)
• types.h (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -31 +31 @@
  */
 #ifdef HAVE_SYS_CDEFS_H
-# if defined(__LINUX__) && defined(__KERNEL__)
+# if defined(RT_ARCH_LINUX) && defined(__KERNEL__)
 #  error "oops"
 # endif
@@ -81 +81 @@
 #define GC_ARCH_BITS
 #endif /* __DOXYGEN__ */
+
+/* A temporary hack. */
+#ifndef RT_ARCH_LINUX
+# ifdef __LINUX__
+#  define RT_ARCH_LINUX
+#  warning "__LINUX__ without RT_ARCH_LINUX!"
+# endif 
+#endif 
 
 /** @def RT_ARCH_X86

trunk/include/iprt/mem.h

@@ -154 +154 @@
 RTDECL(void)      RTMemExecFree(void *pv);
 
-#if defined(IN_RING0) && defined(RT_ARCH_AMD64) && defined(__LINUX__)
+#if defined(IN_RING0) && defined(RT_ARCH_AMD64) && defined(RT_OS_LINUX)
 /**
  * Donate read+write+execute memory to the exec heap.

trunk/include/iprt/spinlock.h

@@ -40 +40 @@
 {
 #ifdef IN_RING0
-# ifdef __LINUX__
+# ifdef RT_OS_LINUX
     /** The saved [R|E]FLAGS. */
     unsigned long   flFlags;

trunk/include/iprt/stdint.h

@@ -38 +38 @@
 #include <iprt/cdefs.h>
 
-#if (!defined(__LINUX__) || !defined(__KERNEL__)) && !defined(_MSC_VER) && !defined(__IBMC__) && !defined(__IBMCPP__) && !defined(IPRT_NO_CRT)
+#if (!defined(RT_OS_LINUX) || !defined(__KERNEL__)) && !defined(_MSC_VER) && !defined(__IBMC__) && !defined(__IBMCPP__) && !defined(IPRT_NO_CRT)
 # include <stdint.h>
 
 #else
 
-#if (!defined(__LINUX__) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */
+#if (!defined(RT_OS_LINUX) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */
 /* machine specific */
 typedef signed char     __int8_t;
@@ -65 +65 @@
 #endif /* !linux kernel */
 
-#if !defined(_WIN64) || defined(__i386__) || defined(__I386__) || defined(__LINUX__) /** @todo fix this, __x86__ should suffice if cdefs.h is included! */
+#if !defined(_WIN64) || defined(__i386__) || defined(__I386__) || defined(RT_OS_LINUX) /** @todo fix this, __x86__ should suffice if cdefs.h is included! */
 typedef signed long             __intptr_t;
 typedef unsigned long           __uintptr_t;
@@ -75 +75 @@
 
 /* the stuff we use */
-#if (!defined(__LINUX__) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */
+#if (!defined(RT_OS_LINUX) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */
 #ifndef _INT8_T_DECLARED
 typedef __int8_t        int8_t;

trunk/include/iprt/string.h

@@ -26 +26 @@
 #include <iprt/stdarg.h>
 #include <iprt/err.h> /* for VINF_SUCCESS */
-#if defined(__LINUX__) && defined(__KERNEL__)
+#if defined(RT_OS_LINUX) && defined(__KERNEL__)
 # include <linux/string.h>
 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)

trunk/include/iprt/types.h

@@ -59 +59 @@
 #  endif
 
-# elif defined(__LINUX__) && defined(__KERNEL__)
+# elif defined(RT_OS_LINUX) && defined(__KERNEL__)
     /*
      * Kludge for the linux kernel: