Changeset 60603 in vbox

Timestamp:

Apr 20, 2016 2:32:19 PM (9 years ago)

Author:

vboxsync

Message:

Assorted compile fixes for FreeBSD

Location:

trunk

Files:

• include/iprt/asm.h (modified) (1 diff)
• include/iprt/string.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/freebsd/Makefile (modified) (1 diff)
• src/VBox/HostDrivers/Support/freebsd/files_vboxdrv (modified) (2 diffs)
• src/VBox/Runtime/r0drv/alloc-ef-r0drv.cpp (modified) (2 diffs)

trunk/include/iprt/asm.h

@@ -3954 +3954 @@
  * @remarks No alignment requirements.
  */
-#if !defined(RT_OS_LINUX) || !defined(__KERNEL__)
+#if    (!defined(RT_OS_LINUX) || !defined(__KERNEL__)) \
+    && (!defined(RT_OS_FREEBSD) || !defined(_KERNEL))
 DECLASM(void *) ASMMemFirstMismatchingU8(void const *pv, size_t cb, uint8_t u8);
 #else

trunk/include/iprt/string.h

@@ -114 +114 @@
 #endif
 
-#if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE)
+#if (!defined(RT_OS_LINUX) || !defined(_GNU_SOURCE)) && !defined(RT_OS_FREEBSD)
 RT_C_DECLS_BEGIN
 void *memrchr(const char *pv, int ch, size_t cb);

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -468 +468 @@
     /* VBoxUSB */
     (PFNRT)RTPathStripFilename,
+#if !defined(RT_OS_FREEBSD)
     (PFNRT)RTStrPurgeEncoding,
+#endif
     NULL
 };

trunk/src/VBox/HostDrivers/Support/freebsd/Makefile

@@ -149 +149 @@
 SRCS += \
         alloc-r0drv.c \
+        alloc-ef-r0drv.c \
         initterm-r0drv.c \
         memobj-r0drv.c \

trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

@@ -152 +152 @@
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/lockvalidator.h=>include/internal/lockvalidator.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+    ${PATH_ROOT}/src/VBox/Runtime/include/internal/mem.h=>include/internal/mem.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
@@ -178 +179 @@
     ${PATH_ROOT}/src/VBox/Runtime/generic/uuid-generic.cpp=>generic/uuid-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-ef-r0drv.cpp=>r0drv/alloc-ef-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \

trunk/src/VBox/Runtime/r0drv/alloc-ef-r0drv.cpp

@@ -118 +118 @@
 #ifdef RT_OS_WINDOWS
 # include <Windows.h>
-#else
+#elif !defined(RT_OS_FREEBSD)
 # include <sys/mman.h>
 #endif
@@ -382 +382 @@
  * This is something which you should call from gdb.
  */
-extern "C" void RTMemDump(void);
+RT_C_DECLS_BEGIN
+void RTMemDump(void);
+RT_C_DECLS_END
+
 void RTMemDump(void)
 {