Changeset 25477 in vbox

Timestamp:

Dec 18, 2009 12:46:53 PM (15 years ago)

Author:

vboxsync

Message:

include: Made the headers build cleanly on linux again.

Location:

trunk/include

Files:

• Makefile.kmk (modified) (4 diffs)
• VBox/dbus-calls.h (modified) (1 diff)
• VBox/dbus.h (modified) (3 diffs)
• VBox/pdmcommon.h (modified) (1 diff)
• iprt/nocrt/amd64/math.h (modified) (1 diff)

trunk/include/Makefile.kmk

@@ -35 +35 @@
         VBox/vrdpusb.h \
         VBox/VBoxHDD.h \
+        VBox/VBoxHDD-Plugin.h \
+        VBox/dbus.h \
+        VBox/uvm.h \
         iprt/tcp.h \
-        iprt/localipc.h
+        iprt/localipc.h \
+        iprt/linux/sysfs.h \
 
+# We omit a few headers which have platform specific issues or are templates.
 hdrs := $(filter-out \
         VBox/VBoxGuest16.h \
+        VBox/VBoxGL2D.h \
         VBox/WinNetConfig.h \
+        VBox/dbus-calls.h \
         VBox/usblib-win.h \
-        VBox/usblib-solaris.h, \
-        $(wildcard VBox/*.h iprt/*.h iprt/*/*.h))
+        VBox/usblib-solaris.h \
+        $(foreach os,$(filter-out $(KBUILD_TARGET),$(KBUILD_OSES)),iprt/$(os)/% VBox/$(os)/%) \
+        $(xforeach arch,$(KBUILD_ARCHES),iprt/nocrt/$(arch)/%) \
+        , $(wildcard VBox/*.h iprt/*.h iprt/*/*.h))
 
 hdrs.r3 := $(filter-out , $(hdrs))
@@ -53 +62 @@
         iprt/mem.h \
         iprt/alloc.h \
-        $(cpp_hdrs) $(r3_only_hdrs), \
-        $(hdrs))
+        iprt/alloca.h \
+        $(cpp_hdrs) \
+        $(r3_only_hdrs) \
+        , $(hdrs))
 
 SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE
@@ -75 +86 @@
 
 
+# Comment out the next line to simplify header correction.
+VBOX_ROOT_INCLUDE_MAKEFILE = $(PATH_ROOT)/include/Makefile.kmk
 
 include $(KBUILD_PATH)/footer.kmk
@@ -82 +95 @@
 $(eval flatname := $(subst /,_,$(basename $(hdr))))
 $$(PATH_TARGET)/$(flatname)-cpp.cpp: $$(PATH_TARGET)/
-        $$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
+        $(QUIET)$$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
 
-$$(PATH_TARGET)/$(flatname)-c.c: Makefile.kmk | $$(PATH_TARGET)/
+$$(PATH_TARGET)/$(flatname)-c.c: $(VBOX_ROOT_INCLUDE_MAKEFILE)  | $$(PATH_TARGET)/
 ifn1of ($(hdr),$(cpp_hdrs))
-        $$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
+        $(QUIET)$$(APPEND) -t -n $$@ '#include <$(hdr)>' 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
 else
-        $$(APPEND) -t -n $$@ 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
+        $(QUIET)$$(APPEND) -t -n $$@ 'int main(int argc, char **argv) {(void)argc; (void)argv; return 0;}'
 endif
 

trunk/include/VBox/dbus-calls.h

@@ -31 +31 @@
 
 #ifndef VBOX_PROXY_STUB
-#error This file is a private header, intended to be included in specific places only
+# error This file is a private header, intended to be included in specific places only
 #endif
 

trunk/include/VBox/dbus.h

@@ -33 +33 @@
 #define ___VBox_DBus_h
 
-#include <stdint.h>
+#include <iprt/types.h>
+#include <iprt/stdarg.h>
 
 #define VBOX_DBUS_1_3_LIB "libdbus-1.so.3"
@@ -50 +51 @@
     void *padding1;
 };
+typedef struct DBusError DBusError;
+
 struct DBusConnection;
 typedef struct DBusConnection DBusConnection;
+
 typedef uint32_t dbus_bool_t;
 typedef uint32_t dbus_uint32_t;
 typedef enum { DBUS_BUS_SESSON, DBUS_BUS_SYSTEM, DBUS_BUS_STARTER } DBusBusType;
+
 struct DBusMessage;
 typedef struct DBusMessage DBusMessage;
+
 struct DBusMessageIter
 {
@@ -104 +110 @@
 /* Declarations of the functions that we need from libdbus-1 */
 #define VBOX_PROXY_STUB(function, rettype, signature, shortsig) \
-RTR3DECL(rettype) ( function ) signature ;
+    RTR3DECL(rettype) ( function ) signature ;
 
 #include <VBox/dbus-calls.h>

trunk/include/VBox/pdmcommon.h

@@ -30 +30 @@
 #ifndef ___VBox_pdmcommon_h
 #define ___VBox_pdmcommon_h
+
+#include <VBox/types.h>
 
 /** @defgroup grp_pdm_common    Common Definitions & Types

trunk/include/iprt/nocrt/amd64/math.h

@@ -34 +34 @@
 
 
-#if RT_INLINE_ASM_GNU_STYLE
+#if RT_INLINE_ASM_GNU_STYLE && defined(__SSE__)
 
 DECLINLINE(long double) inline_atan2l(long double lrd1, long double lrd2)