From 9f01249d7f81514a38c44dff2a4a4612dbf97cae Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 5 Jun 2011 15:10:56 +0200 Subject: [PATCH 1/2] configure.ac: Fix help string for mitshm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pasting from ./configure --help's output, one would get: | configure: WARNING: unrecognized options: --disable-shm Fix the help string to include the previously missing “mit” bits. Reviewed-by: Gaetan Nadon Reviewed-by: Alan Coopersmith Signed-off-by: Cyril Brulebois --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]) From 24b2b43e85c1e3f3d242ccab8793bf4ef83cfac4 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 5 Jun 2011 14:53:08 +0200 Subject: [PATCH 2/2] render: Replace __inline with inline. Also remove traces from the past. Reviewed-by: Alan Coopersmith Signed-off-by: Cyril Brulebois --- render/mipict.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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,