Changeset 3888 in vbox for trunk/include

Timestamp:

Jul 26, 2007 4:26:39 PM (17 years ago)

Author:

vboxsync

Message:

Solaris.

Location:

trunk/include/iprt

Files:

• spinlock.h (modified) (1 diff)
• string.h (modified) (1 diff)

trunk/include/iprt/spinlock.h

@@ -62 +62 @@
 #  define RTSPINLOCKTMP_INITIALIZER { 0 }
 
-# elif defined(RT_OS_OS2) || defined(RT_OS_FREEBSD)
+# elif defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS)
     /** The saved [R|E]FLAGS. (dummy) */
     RTUINTREG       uFlags;

trunk/include/iprt/string.h

@@ -38 +38 @@
 # include <string.h>
 # undef strdup
+#elif defined(RT_OS_SOLARIS) && defined(_KERNEL)
+  /*
+   * Same case as with FreeBSD kernel:
+   * The string.h stuff clashes with sys/systm.h
+   * ffs = find first set bit.
+   */
+# define ffs ffs_string_h
+# include <string.h>
+# undef ffs
 #else
 # include <string.h>