Changeset 53999 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 28, 2015 12:16:50 AM (10 years ago)

Author:

vboxsync

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

97904

Message:

solaris build fixes.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h (modified) (5 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -49 +49 @@
 typedef unsigned int                uint_t;
 typedef uintptr_t                   ulong_t;
+#ifndef RT_OS_SOLARIS
 typedef int64_t                     longlong_t;
 typedef uint64_t                    u_longlong_t;
 typedef uint64_t                    hrtime_t;
+typedef uint32_t                    id_t;
+typedef uint32_t                    zoneid_t;
+#endif
 #if !defined(NGREG) || !defined(RT_OS_LINUX)
 typedef RTCCINTREG                  greg_t;
@@ -58 +62 @@
 #endif
 typedef uintptr_t                   pc_t;
-typedef uint32_t                    id_t;
 typedef unsigned int                model_t;
-typedef uint32_t                    zoneid_t;
 typedef RTCPUID                     processorid_t;
 #if defined(_MSC_VER) || defined(IN_RING0)
@@ -70 +72 @@
 #endif
 
-#define NANOSEC                     RT_NS_1SEC
-#define MICROSEC                    RT_US_1SEC
-#define MILLISEC                    RT_MS_1SEC
-#define SEC                         (1)
+#if !defined(NANOSEC) || !defined(RT_OS_SOLARIS)
+# define NANOSEC                    RT_NS_1SEC
+#endif
+#if !defined(MICROSEC) || !defined(RT_OS_SOLARIS)
+# define MICROSEC                   RT_US_1SEC
+#endif
+#if !defined(MILLISEC) || !defined(RT_OS_SOLARIS)
+# define MILLISEC                   RT_MS_1SEC
+#endif
+#if !defined(SEC) || !defined(RT_OS_SOLARIS)
+# define SEC                        (1)
+#endif
 #define MAXPATHLEN                  RTPATH_MAX
 #undef PATH_MAX
@@ -99 +109 @@
 #  define _IPL32                    1
 # endif
-# define _LITTLE_ENDIAN             1
+# if !defined(_LITTLE_ENDIAN) || !defined(RT_OS_SOLARIS)
+#  define _LITTLE_ENDIAN            1
+# endif
 
 #elif defined(RT_ARCH_AMD64)
@@ -111 +123 @@
 #  define _LP64                     1
 # endif
-# define _LITTLE_ENDIAN             1
+# if !defined(_LITTLE_ENDIAN) || !defined(RT_OS_SOLARIS)
+#  define _LITTLE_ENDIAN            1
+# endif
 
 #else