Changeset 35396 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Jan 3, 2011 9:27:09 PM (14 years ago)

Author:

vboxsync

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

69258

Message:

backed out r69255, r69257 (does currently not compile)

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (3 diffs)
• vboxutils.c (modified) (1 diff)
• vboxvideo.c (modified) (1 diff)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -38 +38 @@
         XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
-        IN_MODULE XFree86Module IN_XF86_MODULE
+        IN_MODULE XFree86Module
 vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
 vboxvideo_drv_INCS = \
@@ -75 +75 @@
         vboxutils.c \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
-        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 
 
@@ -97 +97 @@
 endif
 vboxvideo_drv_70_DEFS := \
-        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 IN_XF86_MODULE
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_drv_70_DEFS += __EXTENSIONS__

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -25 +25 @@
 #include "xf86.h"
 #define NEED_XF86_TYPES
-#include <iprt/string.h>
+#ifdef NO_ANSIC
+# include <string.h>
+#else
+# include "xf86_ansic.h"
+#endif
 #include "compiler.h"
 #include "cursorstr.h"

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1160 +1160 @@
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    uint64_t cbOldFB, cbNewFB;
+    int64_t cbOldFB, cbNewFB;
 
     cbOldFB = pVBox->cbLine * pScrn->virtualX;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -107 +107 @@
 #endif
 
-#include <iprt/string.h>
+#ifndef NO_ANSIC
+/* All drivers need this */
+# include "xf86_ansic.h"
+#endif
+
 #include "compiler.h"