Merge branch 'mesa_7_7_branch'

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;