Changeset 666 in vbox for trunk/include/iprt

Timestamp:

Feb 6, 2007 2:46:38 AM (18 years ago)

Author:

vboxsync

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

18303

Message:

Messing with the nocrt setup...

Location:

trunk/include/iprt

Files:

• nocrt/compiler/compiler.h (added)
• nocrt/compiler/gcc.h (modified) (2 diffs)
• nocrt/stdarg.h (added)
• stdarg.h (modified) (1 diff)
• types.h (modified) (1 diff)

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

@@ -30 +30 @@
 #define _SIZE_T_DECLARED
 
-#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
-
-#ifdef __WCHAR_TYPE__
+#ifndef __cplusplus
+# ifdef __WCHAR_TYPE__
 typedef __WCHAR_TYPE__ wchar_t;
-#elif defined(__OS2__) || defined(__WIN__) 
+# elif defined(__OS2__) || defined(__WIN__) 
 typedef uint16_t wchar_t;
-#else
+# else
 typedef int wchar_t;
+# endif
+# define _WCHAR_T_DECLARED
 #endif
-#define _WCHAR_T_DECLARED
 
 #ifdef __WINT_TYPE__
@@ -76 +66 @@
 #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
+
+
+/* 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)
+
+
 #endif

trunk/include/iprt/stdarg.h

@@ -22 +22 @@
 #define __iprt_stdarg_h__
 
-#include <stdarg.h>
+#ifndef IPRT_NO_CRT
+# include <stdarg.h>
+#else
+# include <iprt/types.h>
+# include <iprt/nocrt/compiler/compiler.h>
+#endif
 
 /*

trunk/include/iprt/types.h

@@ -68 +68 @@
 # endif
 #else /* no crt */
-# if defined(__GNUC__)
-#  if defined(__OS2__) || defined(__FREEBSD__)
-#   include <iprt/nocrt/compiler/gcc.h>
-#  else
-#   include <stddef.h>
-#   ifndef _SIZE_T_DECLARED
-#    define _SIZE_T_DECLARED
-#    if defined(__X86__)
-      typedef unsigned int size_t;
-#    else
-      typedef uintptr_t size_t;
-#    endif
-#   endif
-#   ifndef _SSIZE_T_DECLARED
-#    define _SSIZE_T_DECLARED
-#    if defined(__X86__)
-      typedef int ssize_t;
-#    else
-      typedef intptr_t ssize_t;
-#    endif
-#   endif
-#  endif
-# else /* !__GNUC__ */
-   typedef uintptr_t size_t;
-   typedef intptr_t ssize_t;
-# endif /* !__GNUC__ */
+# include <iprt/nocrt/compiler/gcc.h>
 #endif /* no crt */