Changeset 23525 in vbox for trunk/include/iprt

Timestamp:

Oct 3, 2009 5:50:45 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/FreeBSD: Don't use R3 headers in the kernel driver

Location:

trunk/include/iprt

Files:

• alloca.h (modified) (1 diff)
• stdarg.h (modified) (1 diff)
• stdint.h (modified) (2 diffs)
• string.h (modified) (2 diffs)
• types.h (modified) (1 diff)

trunk/include/iprt/alloca.h

@@ -39 +39 @@
  */
 #if defined(IN_RING0) \
- && (defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS))
+ && (defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD))
 /* ASSUMES GNU C */
 # define alloca(cb) __builtin_alloca(cb)

trunk/include/iprt/stdarg.h

@@ -31 +31 @@
 #define ___iprt_stdarg_h
 
-#ifndef IPRT_NO_CRT
+#if    !defined(IPRT_NO_CRT) \
+    && !(defined(RT_OS_FREEBSD) && defined(_KERNEL))
+
 # include <stdarg.h>
+#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
+# include <machine/stdarg.h>
 #else
 # include <iprt/types.h>

trunk/include/iprt/stdint.h

@@ -38 +38 @@
  */
 #if !(defined(RT_OS_LINUX) && defined(__KERNEL__))  \
+  && !(defined(RT_OS_FREEBSD) && defined(_KERNEL)) \
   && !defined(_MSC_VER) \
   && !defined(__IBMC__) \
@@ -65 +66 @@
 #  define UINT32_C(Value)   (Value ## U)
 # endif /* 64-bit darwin kludge. */
+
+#elif defined(RT_OS_FREEBSD) && defined(_KERNEL) \
+
+# ifndef __STDC_CONSTANT_MACROS
+#  define __STDC_CONSTANT_MACROS
+# endif
+# ifndef __STDC_LIMIT_MACROS
+#  define __STDC_LIMIT_MACROS
+# endif
+# include <sys/stdint.h>
 
 #else /* No system stdint.h */

trunk/include/iprt/string.h

@@ -38 +38 @@
 # include <linux/string.h>
 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
-  /*
-   * Kludge for the FreeBSD kernel:
-   *  Some of the string.h stuff clashes with sys/libkern.h, so just wrap
-   *  it up while including string.h to keep things quiet. It's nothing
-   *  important that's clashing, after all.
-   */
-# define strdup strdup_string_h
-# include <string.h>
-# undef strdup
+# include <sys/libkern.h>
 #elif defined(RT_OS_SOLARIS) && defined(_KERNEL)
   /*
@@ -65 +57 @@
  * IPRT instead of the operating environment.
  */
-#if defined(RT_OS_DARWIN) && defined(KERNEL)
+#if    (defined(RT_OS_DARWIN) && defined(KERNEL)) \
+    || (defined(RT_OS_FREEBSD) && defined(_KERNEL))
 RT_C_DECLS_BEGIN
 void *memchr(const void *pv, int ch, size_t cb);

trunk/include/iprt/types.h

@@ -59 +59 @@
 #   undef offsetof
 #  endif
-#  include <stddef.h>
+#  include <sys/stddef.h>
 #  ifndef _SYS_TYPES_H_
 #   undef offsetof