diff options
author | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
commit | f0fe478c1587780690edc465d957a762e02acc8a (patch) | |
tree | de129251264e7c4fa5c8c7119583dc18af9a3fab /tests/ttmtest/src/xf86dri.c | |
parent | e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 (diff) | |
parent | 62cdc6dbb3545d21bc3a68987d0781f277ae6ee4 (diff) |
Merge branch 'master' into modesetting-101
Conflicts:
shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'tests/ttmtest/src/xf86dri.c')
-rw-r--r-- | tests/ttmtest/src/xf86dri.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/ttmtest/src/xf86dri.c b/tests/ttmtest/src/xf86dri.c index ad92504e..5491473c 100644 --- a/tests/ttmtest/src/xf86dri.c +++ b/tests/ttmtest/src/xf86dri.c @@ -45,6 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xlibint.h> #include <X11/extensions/Xext.h> #include <X11/extensions/extutil.h> +#include <stdint.h> #include "xf86dristr.h" static XExtensionInfo _xf86dri_info_data; |