xserver: Branch 'master'

[Aaron Plattner]

 Xext/Makefile.am |    2 +-
 Xext/shm.c       |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b37b1e66996f8335dafc97b12d25aaec452b931e
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Jul 30 18:48:27 2008 -0700

    Make shmint.h part of the SDK.
    
    This includes ShmRegisterFuncs, ShmSetPixmapFormat, fbShmPutImage, and
    ShmRegisterFbFuncs.  Note that fbShmPutImage was already exported.

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 60b4c4c..fc4376e 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
-sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h
+sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h
 endif
 
 # Sources always included in libXextbuiltin.la & libXext.la
diff --git a/Xext/shm.c b/Xext/shm.c
index 52e477f..6465edb 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -283,13 +283,13 @@ ShmResetProc(ExtensionEntry *extEntry)
     }
 }
 
-void
+_X_EXPORT void
 ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
 {
     shmFuncs[pScreen->myNum] = funcs;
 }
 
-void
+_X_EXPORT void
 ShmSetPixmapFormat(ScreenPtr pScreen, int format)
 {
     shmPixFormat[pScreen->myNum] = format;
@@ -316,7 +316,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
     return ret;
 }
 
-void
+_X_EXPORT void
 ShmRegisterFbFuncs(ScreenPtr pScreen)
 {
     shmFuncs[pScreen->myNum] = &fbFuncs;