Changeset 3637
- Timestamp:
- 07/16/07 15:06:53 (1 year ago)
- Files:
-
- trunk/include/iprt/cdefs.h (modified) (2 diffs)
- trunk/include/iprt/mem.h (modified) (1 diff)
- trunk/include/iprt/spinlock.h (modified) (1 diff)
- trunk/include/iprt/stdint.h (modified) (3 diffs)
- trunk/include/iprt/string.h (modified) (1 diff)
- trunk/include/iprt/types.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/iprt/cdefs.h
r3636 r3637 31 31 */ 32 32 #ifdef HAVE_SYS_CDEFS_H 33 # if defined( __LINUX__) && defined(__KERNEL__)33 # if defined(RT_ARCH_LINUX) && defined(__KERNEL__) 34 34 # error "oops" 35 35 # endif … … 81 81 #define GC_ARCH_BITS 82 82 #endif /* __DOXYGEN__ */ 83 84 /* A temporary hack. */ 85 #ifndef RT_ARCH_LINUX 86 # ifdef __LINUX__ 87 # define RT_ARCH_LINUX 88 # warning "__LINUX__ without RT_ARCH_LINUX!" 89 # endif 90 #endif 83 91 84 92 /** @def RT_ARCH_X86 trunk/include/iprt/mem.h
r3636 r3637 154 154 RTDECL(void) RTMemExecFree(void *pv); 155 155 156 #if defined(IN_RING0) && defined(RT_ARCH_AMD64) && defined( __LINUX__)156 #if defined(IN_RING0) && defined(RT_ARCH_AMD64) && defined(RT_OS_LINUX) 157 157 /** 158 158 * Donate read+write+execute memory to the exec heap. trunk/include/iprt/spinlock.h
r3636 r3637 40 40 { 41 41 #ifdef IN_RING0 42 # ifdef __LINUX__42 # ifdef RT_OS_LINUX 43 43 /** The saved [R|E]FLAGS. */ 44 44 unsigned long flFlags; trunk/include/iprt/stdint.h
r3630 r3637 38 38 #include <iprt/cdefs.h> 39 39 40 #if (!defined( __LINUX__) || !defined(__KERNEL__)) && !defined(_MSC_VER) && !defined(__IBMC__) && !defined(__IBMCPP__) && !defined(IPRT_NO_CRT)40 #if (!defined(RT_OS_LINUX) || !defined(__KERNEL__)) && !defined(_MSC_VER) && !defined(__IBMC__) && !defined(__IBMCPP__) && !defined(IPRT_NO_CRT) 41 41 # include <stdint.h> 42 42 43 43 #else 44 44 45 #if (!defined( __LINUX__) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */45 #if (!defined(RT_OS_LINUX) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */ 46 46 /* machine specific */ 47 47 typedef signed char __int8_t; … … 65 65 #endif /* !linux kernel */ 66 66 67 #if !defined(_WIN64) || defined(__i386__) || defined(__I386__) || defined( __LINUX__) /** @todo fix this, __x86__ should suffice if cdefs.h is included! */67 #if !defined(_WIN64) || defined(__i386__) || defined(__I386__) || defined(RT_OS_LINUX) /** @todo fix this, __x86__ should suffice if cdefs.h is included! */ 68 68 typedef signed long __intptr_t; 69 69 typedef unsigned long __uintptr_t; … … 75 75 76 76 /* the stuff we use */ 77 #if (!defined( __LINUX__) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */77 #if (!defined(RT_OS_LINUX) && !defined(__KERNEL__)) || defined(IPRT_NO_CRT) || defined(_MSC_VER) /** @todo remove _MSC_VER check (vcc8 merge) */ 78 78 #ifndef _INT8_T_DECLARED 79 79 typedef __int8_t int8_t; trunk/include/iprt/string.h
r3636 r3637 26 26 #include <iprt/stdarg.h> 27 27 #include <iprt/err.h> /* for VINF_SUCCESS */ 28 #if defined( __LINUX__) && defined(__KERNEL__)28 #if defined(RT_OS_LINUX) && defined(__KERNEL__) 29 29 # include <linux/string.h> 30 30 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL) trunk/include/iprt/types.h
r3636 r3637 59 59 # endif 60 60 61 # elif defined( __LINUX__) && defined(__KERNEL__)61 # elif defined(RT_OS_LINUX) && defined(__KERNEL__) 62 62 /* 63 63 * Kludge for the linux kernel:
