VirtualBox

Changeset 35398 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Jan 4, 2011 9:39:07 AM (14 years ago)
Author:
vboxsync
Message:

re-applied r69255, r69257: properly wrap mem* to xf86mem* for older XF86 modules

Location:
trunk/src/VBox/Additions
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

    r35396 r35398  
    2525#include <iprt/asm.h>
    2626#include <iprt/log.h>
    27 
    28 #include <string.h>
     27#include <iprt/string.h>
    2928
    3029/** Send completion notification to the host for the command located at offset

  • trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

    r35396 r35398  
    2222#include <VBox/log.h>
    2323#include <iprt/assert.h>
    24 
    25 #include <string.h>
     24#include <iprt/string.h>
    2625
    2726/*

  • trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

    r35396 r35398  
    3838        XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
    3939        BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
    40         IN_MODULE XFree86Module PNP_MOUSE
     40        IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
    4141 vboxmouse_drv_INCS := \
    4242        $(VBOX_PATH_X11_XFREE_4_3)/include \
    … …  
    6363vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
    6464vboxmouse_drv_70_DEFS = \
    65         XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
     65        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
    6666ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
    6767 vboxmouse_drv_70_DEFS += _XPG6 __EXTENSIONS__

  • trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c

    r35396 r35398  
    2424#include "xf86.h"
    2525#define NEED_XF86_TYPES
    26 #ifdef NO_ANSIC
    27 # include <errno.h>
    28 # include <string.h>
    29 #else
    30 # include "xf86_ansic.h"
    31 #endif
     26#include <iprt/string.h>
    3227#include "compiler.h"
    3328

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

    r35396 r35398  
    3838        XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
    3939        BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
    40         IN_MODULE XFree86Module
     40        IN_MODULE XFree86Module IN_XF86_MODULE
    4141vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
    4242vboxvideo_drv_INCS = \
    … …  
    7575        vboxutils.c \
    7676        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
     77        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
     78        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
    7779        $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
    7880        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
    79         $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp \
    80         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
    81         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
     81        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
    8282
    8383
    … …  
    9797endif
    9898vboxvideo_drv_70_DEFS := \
    99         XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1
     99        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 IN_XF86_MODULE
    100100ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
    101101 vboxvideo_drv_70_DEFS += __EXTENSIONS__

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

    r35396 r35398  
    2525#include "xf86.h"
    2626#define NEED_XF86_TYPES
    27 #ifdef NO_ANSIC
    28 # include <string.h>
    29 #else
    30 # include "xf86_ansic.h"
    31 #endif
     27#include <iprt/string.h>
    3228#include "compiler.h"
    3329#include "cursorstr.h"

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

    r35396 r35398  
    11601160{
    11611161    VBOXPtr pVBox = VBOXGetRec(pScrn);
    1162     int64_t cbOldFB, cbNewFB;
     1162    uint64_t cbOldFB, cbNewFB;
    11631163
    11641164    cbOldFB = pVBox->cbLine * pScrn->virtualX;

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

    r35396 r35398  
    107107#endif
    108108
    109 #ifndef NO_ANSIC
    110 /* All drivers need this */
    111 # include "xf86_ansic.h"
    112 #endif
    113 
     109#include <iprt/string.h>
    114110#include "compiler.h"
    115111

  • trunk/src/VBox/Additions/x11/x11include/1.3/xorg/xf86_ansic.h

    r35396 r35398  
    265265extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    266266extern int xf86munmap(void*, xf86size_t);
    267 extern int xf86stat(const char *, struct xf86stat *);
    268 extern int xf86fstat(int, struct xf86stat *);
     267extern int xf86stat(const char *, struct xf86stat_s *);
     268extern int xf86fstat(int, struct xf86stat_s *);
    269269extern int xf86access(const char *, int);
    270270extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/1.3/xorg/xf86_libc.h

    r35396 r35398  
    8686typedef unsigned int xf86gid_t;
    8787
    88 struct xf86stat {
     88struct xf86stat_s {
    8989    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    9090};
    … …  
    549549#define gid_t                   xf86gid_t
    550550#undef stat_t
    551 #define stat_t                  struct xf86stat
     551#define stat_t                  struct xf86stat_s
    552552
    553553#undef ulong

  • trunk/src/VBox/Additions/x11/x11include/1.4/xorg/xf86_ansic.h

    r35396 r35398  
    249249extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    250250extern int xf86munmap(void*, xf86size_t);
    251 extern int xf86stat(const char *, struct xf86stat *);
    252 extern int xf86fstat(int, struct xf86stat *);
     251extern int xf86stat(const char *, struct xf86stat_s *);
     252extern int xf86fstat(int, struct xf86stat_s *);
    253253extern int xf86access(const char *, int);
    254254extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/1.4/xorg/xf86_libc.h

    r35396 r35398  
    8686typedef unsigned int xf86gid_t;
    8787
    88 struct xf86stat {
     88struct xf86stat_s {
    8989    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    9090};
    … …  
    549549#define gid_t                   xf86gid_t
    550550#undef stat_t
    551 #define stat_t                  struct xf86stat
     551#define stat_t                  struct xf86stat_s
    552552
    553553#undef ulong

  • trunk/src/VBox/Additions/x11/x11include/4.3/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h

    r35396 r35398  
    272272extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    273273extern int xf86munmap(void*, xf86size_t);
    274 extern int xf86stat(const char *, struct xf86stat *);
    275 extern int xf86fstat(int, struct xf86stat *);
     274extern int xf86stat(const char *, struct xf86stat_s *);
     275extern int xf86fstat(int, struct xf86stat_s *);
    276276extern int xf86access(const char *, int);
    277277extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/4.3/programs/Xserver/hw/xfree86/os-support/xf86_libc.h

    r35396 r35398  
    6464typedef unsigned int xf86gid_t;
    6565
    66 struct xf86stat {
     66struct xf86stat_s {
    6767    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    6868};
    … …  
    505505#define gid_t                   xf86gid_t
    506506#undef stat_t
    507 #define stat_t                  struct xf86stat
     507#define stat_t                  struct xf86stat_s
    508508
    509509#undef ulong

  • trunk/src/VBox/Additions/x11/x11include/7.0/xorg/xf86_ansic.h

    r35396 r35398  
    274274extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    275275extern int xf86munmap(void*, xf86size_t);
    276 extern int xf86stat(const char *, struct xf86stat *);
    277 extern int xf86fstat(int, struct xf86stat *);
     276extern int xf86stat(const char *, struct xf86stat_s *);
     277extern int xf86fstat(int, struct xf86stat_s *);
    278278extern int xf86access(const char *, int);
    279279extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/7.0/xorg/xf86_libc.h

    r35396 r35398  
    9090typedef unsigned int xf86gid_t;
    9191
    92 struct xf86stat {
     92struct xf86stat_s {
    9393    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    9494};
    … …  
    553553#define gid_t                   xf86gid_t
    554554#undef stat_t
    555 #define stat_t                  struct xf86stat
     555#define stat_t                  struct xf86stat_s
    556556
    557557#undef ulong

  • trunk/src/VBox/Additions/x11/x11include/7.1/xorg/xf86_ansic.h

    r35396 r35398  
    275275extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    276276extern int xf86munmap(void*, xf86size_t);
    277 extern int xf86stat(const char *, struct xf86stat *);
    278 extern int xf86fstat(int, struct xf86stat *);
     277extern int xf86stat(const char *, struct xf86stat_s *);
     278extern int xf86fstat(int, struct xf86stat_s *);
    279279extern int xf86access(const char *, int);
    280280extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/7.1/xorg/xf86_libc.h

    r35396 r35398  
    9090typedef unsigned int xf86gid_t;
    9191
    92 struct xf86stat {
     92struct xf86stat_s {
    9393    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    9494};
    … …  
    555555#define gid_t                   xf86gid_t
    556556#undef stat_t
    557 #define stat_t                  struct xf86stat
     557#define stat_t                  struct xf86stat_s
    558558
    559559#undef ulong

  • trunk/src/VBox/Additions/x11/x11include/xorg-server-1.3.0.0/xf86_ansic.h

    r35396 r35398  
    265265extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
    266266extern int xf86munmap(void*, xf86size_t);
    267 extern int xf86stat(const char *, struct xf86stat *);
    268 extern int xf86fstat(int, struct xf86stat *);
     267extern int xf86stat(const char *, struct xf86stat_s *);
     268extern int xf86fstat(int, struct xf86stat_s *);
    269269extern int xf86access(const char *, int);
    270270extern int xf86errno;

  • trunk/src/VBox/Additions/x11/x11include/xorg-server-1.3.0.0/xf86_libc.h

    r35396 r35398  
    8686typedef unsigned int xf86gid_t;
    8787
    88 struct xf86stat {
     88struct xf86stat_s {
    8989    xf86dev_t st_rdev;  /* This is incomplete, and makes assumptions */
    9090};
    … …  
    549549#define gid_t                   xf86gid_t
    550550#undef stat_t
    551 #define stat_t                  struct xf86stat
     551#define stat_t                  struct xf86stat_s
    552552
    553553#undef ulong
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette