From 170674a606f6d7869b5fa4457c07e10dd27f2771 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Tue, 24 Nov 2009 09:27:29 -0600 Subject: Finish fixing the build on FreeBSD --- include/drm/drm.h | 4 ++++ include/drm/drm_mode.h | 3 --- include/drm/i915_drm.h | 4 ++-- include/drm/radeon_drm.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/drm/drm.h b/include/drm/drm.h index be6fe12b..9460e2e7 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -46,7 +46,11 @@ typedef unsigned int drm_handle_t; #include #include +typedef int16_t __s16; +typedef uint16_t __u16; +typedef int32_t __s32; typedef uint32_t __u32; +typedef int64_t __s64; typedef uint64_t __u64; typedef unsigned long drm_handle_t; diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 1f908416..852505e7 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -27,9 +27,6 @@ #ifndef _DRM_MODE_H #define _DRM_MODE_H -#include -#include - #define DRM_DISPLAY_INFO_LEN 32 #define DRM_CONNECTOR_NAME_LEN 32 #define DRM_DISPLAY_MODE_LEN 32 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 30baa498..25ff7b79 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -27,11 +27,11 @@ #ifndef _I915_DRM_H_ #define _I915_DRM_H_ +#include "drm.h" + /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. */ -#include -#include "drm.h" /* Each region is a minimum of 16k, and there are at most 255 of them. */ diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 0642836c..728df604 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h @@ -33,7 +33,7 @@ #ifndef __RADEON_DRM_H__ #define __RADEON_DRM_H__ -#include +#include "drm.h" /* WARNING: If you change any of these defines, make sure to change the * defines in the X server file (radeon_sarea.h) -- cgit v1.2.3