xserver: Branch 'master'

[Keith Packard]

 composite/compint.h      |    2 +-
 composite/compositeext.h |    2 ++
 hw/xfree86/sdksyms.sh    |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 31e3c0ff7f5fb36421be8de06e5f6e675ec26ddc
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Apr 19 15:25:41 2012 -0500

    Export CompositeClientWindowType
    
    Make sure CompositeClientWindowType is visible for XResource v1.2
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/composite/compint.h b/composite/compint.h
index 6c4272e..9e2713e 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -71,6 +71,7 @@
 #include "damageextint.h"
 #include "xfixes.h"
 #include <X11/extensions/compositeproto.h>
+#include "compositeext.h"
 #include <assert.h>
 
 /*
@@ -182,7 +183,6 @@ extern DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
 #define GetCompSubwindows(w) ((CompSubwindowsPtr) \
     dixLookupPrivate(&(w)->devPrivates, CompSubwindowsPrivateKey))
 
-extern RESTYPE CompositeClientWindowType;
 extern RESTYPE CompositeClientSubwindowsType;
 extern RESTYPE CompositeClientOverlayType;
 
diff --git a/composite/compositeext.h b/composite/compositeext.h
index 600604d..0b148f0 100644
--- a/composite/compositeext.h
+++ b/composite/compositeext.h
@@ -35,4 +35,6 @@ extern _X_EXPORT Bool CompositeRegisterAlternateVisuals(ScreenPtr pScreen,
                                                         VisualID * vids,
                                                         int nVisuals);
 
+extern _X_EXPORT RESTYPE CompositeClientWindowType;
+
 #endif                          /* _COMPOSITEEXT_H_ */
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 40ea7c8..3815525 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -252,6 +252,8 @@ cat > sdksyms.c << EOF
  */
 
 
+#include "compositeext.h"
+
 /* xfixes/Makefile.am */
 #include "xfixes.h"