diff options
author | Michel Dänzer <[email protected]> | 2009-12-08 12:25:34 +0100 |
---|---|---|
committer | Michel Dänzer <[email protected]> | 2009-12-08 12:25:34 +0100 |
commit | eaa3a025da18a0b7f25460f86bb4afcd08017dfe (patch) | |
tree | 2ea5994f3c592e1eb75e067c157b15542c3c7447 /src/gallium | |
parent | b5e256c76dea2182c82af2a4f66224735701d55a (diff) | |
parent | 32ccc9b0bbfad46d2f4ce3b9ac4cdd182d7b64e4 (diff) |
Merge branch 'mesa_7_7_branch'
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/winsys/drm/vmware/xorg/SConscript | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c | 4 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/xorg/vmw_screen.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/winsys/drm/vmware/xorg/SConscript b/src/gallium/winsys/drm/vmware/xorg/SConscript index ff7b2ed34ed..b8968e7137b 100644 --- a/src/gallium/winsys/drm/vmware/xorg/SConscript +++ b/src/gallium/winsys/drm/vmware/xorg/SConscript @@ -42,6 +42,8 @@ if env['platform'] == 'linux': ]) sources = [ + 'vmw_ioctl.c', + 'vmw_screen.c', 'vmw_xorg.c', ] diff --git a/src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c b/src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c index ad6993840d2..c84368bab7f 100644 --- a/src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c +++ b/src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c @@ -31,7 +31,9 @@ * @author Jakob Bornecrantz <[email protected]> */ -#define HAVE_STDINT_H +#ifndef HAVE_STDINT_H +#define HAVE_STDINT_H 1 +#endif #define _FILE_OFFSET_BITS 64 #include <errno.h> diff --git a/src/gallium/winsys/drm/vmware/xorg/vmw_screen.c b/src/gallium/winsys/drm/vmware/xorg/vmw_screen.c index 421906da996..18cb509189a 100644 --- a/src/gallium/winsys/drm/vmware/xorg/vmw_screen.c +++ b/src/gallium/winsys/drm/vmware/xorg/vmw_screen.c @@ -33,6 +33,8 @@ #include "vmw_hook.h" #include "vmw_driver.h" +#include "cursorstr.h" + /* modified version of crtc functions */ xf86CrtcFuncsRec vmw_screen_crtc_funcs; |