Changeset 67177 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

May 31, 2017 2:59:02 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
[PATCH 3/3] additions/linux/drm: Remove dependency on iprt/cdefs,stdarg,stdint and types.h
Signed-off-by: Hans de Goede <hdegoede@…>
With a small fix to remove a left-over IPRT symbol.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• VBoxVideoIPRT.h (modified) (3 diffs)
• files_vboxvideo_drv (modified) (1 diff)
• vbox_drv.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h

@@ -30 +30 @@
 
 #include <asm/io.h>
-#include <iprt/cdefs.h>
-#include <iprt/stdarg.h>
-#include <iprt/stdint.h>
-#include <iprt/types.h>
-
 #include <linux/string.h>
+#include <linux/version.h>
 
 /** @name VirtualBox error macros
@@ -83 +79 @@
     AssertCompile(sizeof(type) == (size))
 
+#define VALID_PTR(p) (p != NULL)
+
 /** @}  */
 
@@ -115 +113 @@
 typedef uint32_t HGSMIOFFSET;
 
+typedef void RTRECT;
+
+#define UINT32_C(val)           (val ## U)
+#define UINT32_MAX              UINT32_C(0xffffffff)
+
+/** @}  */
+
+/** @name iprt/desc.h replacement macros
+ * @{ */
+
+#define RT_C_DECLS_BEGIN
+#define RT_C_DECLS_END
+#define DECLCALLBACK(type) type
+#define DECLCALLBACKMEMBER(type, name) type (*name)
+#define DECLHIDDEN(type) __attribute__((visibility("hidden"))) type
+#define DECLINLINE(type) static __inline__ type
+#define RT_BOOL(val) (!!(val))
+#define RT_BIT BIT
+#define _1K 0x00000400
+
 /** @}  */
 

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -21 +21 @@
     ${PATH_OUT}/revision-generated.h=>revision-generated.h \
     ${PATH_OUT}/product-generated.h=>product-generated.h \
-    ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
-    ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
-    ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
-    ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -327 +327 @@
 MODULE_LICENSE("GPL and additional rights");
 #ifdef MODULE_VERSION
-MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
-#endif
+MODULE_VERSION(VBOX_VERSION_STRING " r" __stringify(VBOX_SVN_REV));
+#endif