diff options
| author | Matthias Hopf <mhopf@suse.de> | 2006-10-11 18:03:58 +0200 |
|---|---|---|
| committer | Matthias Hopf <mhopf@suse.de> | 2006-10-11 18:03:58 +0200 |
| commit | cc587eb05a8274c4312f8456e51b5f1d024c4594 (patch) | |
| tree | 0f302b0c9a65171286f24d260dfaf87f825a3eab | |
| parent | 79463201eb066497517f0b1282e97a72fbf662dc (diff) | |
Fix build issues due to hard uint32_t and Bool #defines.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/via_dri.h | 2 | ||||
| -rw-r--r-- | src/via_drmclient.h | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index bf38800..7140a48 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC +AC_CHECK_HEADERS([inttypes.h]) if test "x$DRI" != xno; then diff --git a/src/via_dri.h b/src/via_dri.h index b47397d..e7e9f32 100644 --- a/src/via_dri.h +++ b/src/via_dri.h @@ -35,7 +35,7 @@ #define VIA_DRIDDX_VERSION_MINOR 0 #define VIA_DRIDDX_VERSION_PATCH 0 -#ifndef XFree86Server +#if ! defined(XFree86Server) && ! defined(_XTYPEDEF_BOOL) typedef int Bool; #endif diff --git a/src/via_drmclient.h b/src/via_drmclient.h index da1fb1f..2b7dbfb 100644 --- a/src/via_drmclient.h +++ b/src/via_drmclient.h @@ -27,8 +27,12 @@ #include "drm.h" #include "xf86drm.h" -#ifndef uint32_t -#define uint32_t CARD32 +#if HAVE_INTTYPES_H +# include <inttypes.h> +#else +# ifndef uint32_t +# define uint32_t CARD32 +# endif #endif #define UNICHROME_LOCK(fd, lockNo, saPriv, context, lastcontext, ret) \ |