Changeset 3640 in vbox

Timestamp:

Jul 16, 2007 1:23:22 PM (18 years ago)

Author:

vboxsync

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

22911

Message:

some cleanup.

File:

• trunk/include/iprt/stdint.h (modified) (4 diffs)

trunk/include/iprt/stdint.h

@@ -38 +38 @@
 #include <iprt/cdefs.h>
 
-#if (!defined(RT_OS_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(RT_OS_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)
 /* machine specific */
-typedef signed char     __int8_t;
+typedef signed char         __int8_t;
 typedef unsigned char       __uint8_t;
-typedef short           __int16_t;
+typedef short               __int16_t;
 typedef unsigned short      __uint16_t;
-typedef int         __int32_t;
+typedef int                 __int32_t;
 typedef unsigned int        __uint32_t;
 
@@ -59 +59 @@
 typedef struct { __uint32_t lo,hi; } __int64_t, __uint64_t;
 #  else
-typedef long long       __int64_t;
+typedef long long           __int64_t;
 typedef unsigned long long  __uint64_t;
 #  endif
 # endif
-#endif /* !linux kernel */
+#endif /* !linux kernel and more */
 
-#if !defined(_WIN64) || defined(__i386__) || defined(__I386__) || defined(RT_OS_LINUX) /** @todo fix this, __x86__ should suffice if cdefs.h is included! */
+#if ARCH_BITS == 32 || defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 typedef signed long             __intptr_t;
 typedef unsigned long           __uintptr_t;
@@ -75 +75 @@
 
 /* the stuff we use */
-#if (!defined(RT_OS_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)
 #ifndef _INT8_T_DECLARED
 typedef __int8_t        int8_t;
@@ -158 +158 @@
 #endif /* !C++ || __STDC_CONSTANT_MACROS */
 
-#endif /* _MSC_VER */
+#endif /* ! have usable stdint.h */
 
 #endif