xserver: Branch 'master' - 3 commits
Keith Packard
keithp at kemper.freedesktop.org
Wed Sep 21 13:33:44 PDT 2011
configure.ac | 2 +-
render/mipict.c | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit c92c83523ede8bc361526ac93d09d089fbbdae08
Merge: 4ad271d... 24b2b43...
Author: Keith Packard <keithp at keithp.com>
Date: Wed Sep 21 13:32:06 2011 -0700
Merge remote-tracking branch 'kibi/master'
commit 24b2b43e85c1e3f3d242ccab8793bf4ef83cfac4
Author: Cyril Brulebois <kibi at debian.org>
Date: Sun Jun 5 14:53:08 2011 +0200
render: Replace __inline with inline.
Also remove traces from the past.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
diff --git a/render/mipict.c b/render/mipict.c
index 08b2fa7..9a44c27 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,
commit 9f01249d7f81514a38c44dff2a4a4612dbf97cae
Author: Cyril Brulebois <kibi at debian.org>
Date: Sun Jun 5 15:10:56 2011 +0200
configure.ac: Fix help string for mitshm.
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 <memsize at videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
diff --git a/configure.ac b/configure.ac
index 2ac1f2e..4a40762 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])
More information about the xorg-commit
mailing list