[PULL] 2 tiny commits

[Cyril Brulebois]

Hi Keith.

The following changes since commit 0caeef6146bee5fb1827ab25db191685dde9d4b4:

  Version bumped to 1.11 (2011-08-26 16:46:13 -0700)

are available in the git repository at:
  git://people.freedesktop.org/~kibi/xserver master

Cyril Brulebois (2):
      configure.ac: Fix help string for mitshm.
      render: Replace __inline with inline.

 configure.ac    |    2 +-
 render/mipict.c |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

#29109 is still open (--disable-mitshm is broken) but the patch there is
insufficient and I have no extra time to handle that right now. For the
curious:
| make[3]: Entering directory `/home/cbrulebois/debian-x/xserver/xorg-server.git/hw/dmx'
|   CCLD   Xdmx
| picture.c:772: error: undefined reference to 'XaceHook'
| render.c:2047: error: undefined reference to 'XaceHook'
| render.c:2013: error: undefined reference to 'XaceHook'
| render.c:1978: error: undefined reference to 'XaceHook'
| dispatch.c:2205: error: undefined reference to 'XaceCensorImage'
| dispatch.c:2166: error: undefined reference to 'XaceCensorImage'
| dispatch.c:430: error: undefined reference to 'XaceHookDispatch'
| dispatch.c:433: error: undefined reference to 'XaceHookAuditEnd'
| property.c:104: error: undefined reference to 'XaceHookPropertyAccess'
| property.c:351: error: undefined reference to 'XaceHookPropertyAccess'
| property.c:287: error: undefined reference to 'XaceHookPropertyAccess'
| property.c:604: error: undefined reference to 'XaceHookPropertyAccess'
| selection.c:84: error: undefined reference to 'XaceHookSelectionAccess'
| selection.c:206: error: undefined reference to 'XaceHookSelectionAccess'
| collect2: ld returned 1 exit status
| make[3]: *** [Xdmx] Error 1

Mraw,
KiBi.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110831/aee7be08/attachment.pgp>