Merge branch 'mesa_7_7_branch'

This commit is contained in:
Michel Dänzer 2009-12-08 12:25:34 +01:00
commit eaa3a025da
3 changed files with 7 additions and 1 deletions

View file

@ -42,6 +42,8 @@ if env['platform'] == 'linux':
])
sources = [
'vmw_ioctl.c',
'vmw_screen.c',
'vmw_xorg.c',
]

View file

@ -31,7 +31,9 @@
* @author Jakob Bornecrantz <jakob@vmware.com>
*/
#define HAVE_STDINT_H
#ifndef HAVE_STDINT_H
#define HAVE_STDINT_H 1
#endif
#define _FILE_OFFSET_BITS 64
#include <errno.h>

View file

@ -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;