diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2007-09-19 11:44:41 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2007-09-19 11:44:41 +0800 |
| commit | 36b81ba20d20e7b235cb701c5135cbf3f3eedb12 (patch) | |
| tree | 0d506260e3b13e2e8889785fcd9b190d5f338074 /src/xvmc | |
| parent | 02ad9cee330fb5fb0008ad6f74e74e8d8a1fc36e (diff) | |
| parent | bda3c69a7a044869ea63514b97f8aa9260d6b5a7 (diff) | |
Merge branch 'master' into xvmc-i915
Conflicts:
src/i830.h
src/i830_memory.c
Diffstat (limited to 'src/xvmc')
| -rw-r--r-- | src/xvmc/I810XvMC.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xvmc/I810XvMC.h b/src/xvmc/I810XvMC.h index ba8c792d..dc2cab88 100644 --- a/src/xvmc/I810XvMC.h +++ b/src/xvmc/I810XvMC.h @@ -41,6 +41,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* #define XVMC_DEBUG(x) do {x; }while(0); */ #define XVMC_DEBUG(x) +#include <stdint.h> #include "xf86drm.h" #include "i810_common.h" #include <X11/Xlibint.h> |