Changeset 14023 in vbox for trunk/include

Timestamp:

Nov 10, 2008 4:55:30 PM (17 years ago)

Author:

vboxsync

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

39079

Message:

iprt/compiler/msc.h and use compiler/compiler.h instead of compiler/gcc.h

Location:

trunk/include/iprt

Files:

• nocrt/compiler/msc.h (copied) (copied from trunk/include/iprt/nocrt/compiler/gcc.h ) (2 diffs)
• types.h (modified) (1 diff)

trunk/include/iprt/nocrt/compiler/msc.h

@@ -1 +1 @@
 /** @file
- * IPRT / No-CRT - GCC specifics.
- *
- * A quick hack for freebsd where there are no separate location
- * for compiler specific headers like on linux, mingw, os2, ++.
- * This file will be cleaned up later...
+ * IPRT / No-CRT - MSC specifics.
  */
 
@@ -31 +27 @@
  * additional information or have any questions.
  */
-   
-#ifndef ___iprt_nocrt_compiler_gcc_h
-#define ___iprt_nocrt_compiler_gcc_h
+
+#ifndef ___iprt_nocrt_compiler_msc_h
+#define ___iprt_nocrt_compiler_msc_h
 
 
 /* stddef.h */
-#ifdef __PTRDIFF_TYPE__
-typedef __PTRDIFF_TYPE__ ptrdiff_t;
-#elif ARCH_BITS == 32
-typedef int32_t ptrdiff_t;
-#elif ARCH_BITS == 64
-typedef int64_t ptrdiff_t;
-#else
-# error "ARCH_BITS is undefined or incorrect."
-#endif
-#define _PTRDIFF_T_DECLARED
+#define errno msvcrt_errno
+#include <../include/stddef.h>
+#undef errno
 
-#ifdef __SIZE_TYPE__
-typedef __SIZE_TYPE__ size_t;  
-#elif ARCH_BITS == 32
-typedef uint32_t size_t;
-#elif ARCH_BITS == 64
-typedef uint64_t size_t;
-#else
-# error "ARCH_BITS is undefined or incorrect."
-#endif 
-#define _SIZE_T_DECLARED
-
-#ifndef __cplusplus
-# ifdef __WCHAR_TYPE__
-typedef __WCHAR_TYPE__ wchar_t;
-# elif defined(RT_OS_OS2) || defined(RT_OS_WINDOWS) 
-typedef uint16_t wchar_t;
-# else
-typedef int wchar_t;
-# endif
-# define _WCHAR_T_DECLARED
-#endif
-
-#ifdef __WINT_TYPE__
-typedef __WINT_TYPE__ wint_t;
-#else
-typedef unsigned int wint_t;
-#endif
-#define _WINT_T_DECLARED
-
-#ifndef NULL
-# ifdef __cplusplus
-#  define NULL  0
-# else
-#  define NULL  ((void *)0)
-# endif
-#endif 
-
-
-#ifndef offsetof
-# if defined(__cplusplus) && defined(__offsetof__) 
-#  define offsetof(type, memb) 
-    (__offsetof__ (reinterpret_cast<size_t>(&reinterpret_cast<const volatile char &>(static_cast<type *>(0)->memb))) )
-# else
-#  define offsetof(type, memb) ((size_t)&((type *)0)->memb)
-# endif                                        
-#endif                                        
-
-
-/* sys/types.h */
-#ifdef __SSIZE_TYPE__
-typedef __SSIZE_TYPE__ ssize_t;  
-#elif ARCH_BITS == 32
-typedef int32_t ssize_t;
-#elif ARCH_BITS == 64
-typedef int64_t ssize_t;
-#else
-# define ARCH_BITS 123123
-# error "ARCH_BITS is undefined or incorrect."
-#endif 
-#define _SSIZE_T_DECLARED
+#undef ssize_t
+typedef intptr_t ssize_t;
 
 
 /* stdarg.h */
-typedef __builtin_va_list   va_list;
-#define va_start(va, arg)   __builtin_va_start(va, arg)
-#define va_end(va)          __builtin_va_end(va)
-#define va_arg(va, type)    __builtin_va_arg(va, type)
-#define va_copy(dst, src)   __builtin_va_copy(dst, src)
-
+#include <../include/stdarg.h>
 
 #endif
+

trunk/include/iprt/types.h

@@ -105 +105 @@
 
 #else /* no crt */
-# include <iprt/nocrt/compiler/gcc.h>
+# include <iprt/nocrt/compiler/compiler.h>
 #endif /* no crt */