diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-21 13:32:06 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-21 13:32:06 -0700 |
| commit | c92c83523ede8bc361526ac93d09d089fbbdae08 (patch) | |
| tree | e5f1c5622c69af8bb0bc341542efbf992f7acbeb | |
| parent | 4ad271d06c5aa42721c0e2e01e17e34a39825c65 (diff) | |
| parent | 24b2b43e85c1e3f3d242ccab8793bf4ef83cfac4 (diff) | |
Merge remote-tracking branch 'kibi/master'
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | render/mipict.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2ac1f2ec6..4a40762ca 100644 --- a/configure.ac +++ b/configure.ac @@ -608,7 +608,7 @@ AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Pa dnl Extensions. AC_ARG_ENABLE(registry, AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes]) AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) -AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) +AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-mitshm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) diff --git a/render/mipict.c b/render/mipict.c index 08b2fa722..9a44c2729 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -33,10 +33,6 @@ #include "picturestr.h" #include "mipict.h" -#ifndef __GNUC__ -#define __inline -#endif - int miCreatePicture (PicturePtr pPicture) { @@ -307,7 +303,7 @@ miClipPictureReg (pixman_region16_t * pRegion, return pixman_region_not_empty(pRegion); } -static __inline Bool +static inline Bool miClipPictureSrc (RegionPtr pRegion, PicturePtr pPicture, int dx, |