xserver: Branch 'master' - 5 commits

[Adam Jackson]

 fb/fb.h        |   10 ++--------
 fb/wfbrename.h |    2 +-
 mi/migc.h      |    5 +++++
 3 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 8b170c4447868c8d4656cf2143f009db20885f3a
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 16 13:00:24 2017 -0500

    mi: Add include guards to migc.h
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/mi/migc.h b/mi/migc.h
index 8d06a6f..add601a 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -26,6 +26,9 @@ from The Open Group.
 
 */
 
+#ifndef _MIGC_H
+#define _MIGC_H
+
 extern _X_EXPORT void miChangeGC(GCPtr          pGC,
                                  unsigned long  mask);
 
@@ -47,3 +50,5 @@ extern _X_EXPORT void miCopyGC(GCPtr            pGCSrc,
 
 extern _X_EXPORT void miComputeCompositeClip(GCPtr              pGC,
                                              DrawablePtr        pDrawable);
+
+#endif
commit e161853f380a0b176c81284024066cb2776136c3
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 16 13:00:24 2017 -0500

    fb: Remove stray references to fbHasVisualTypes
    
    Removed in 84e8de12.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/fb/fb.h b/fb/fb.h
index 2e8770d..8bce67e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -900,13 +900,9 @@ extern _X_EXPORT void
  fbClearVisualTypes(void);
 
 extern _X_EXPORT Bool
- fbHasVisualTypes(int depth);
-
-extern _X_EXPORT Bool
  fbSetVisualTypes(int depth, int visuals, int bitsPerRGB);
 
 extern _X_EXPORT Bool
-
 fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
                          Pixel redMask, Pixel greenMask, Pixel blueMask);
 
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 4c99ee5..b2d2ff7 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -75,7 +75,6 @@
 #define fbGlyph32 wfbGlyph32
 #define fbGlyph8 wfbGlyph8
 #define fbGlyphs wfbGlyphs
-#define fbHasVisualTypes wfbHasVisualTypes
 #define fbImageGlyphBlt wfbImageGlyphBlt
 #define fbIn wfbIn
 #define fbInitializeColormap wfbInitializeColormap
commit 4c7d229582a97e07014091909745ac7dc4d5e93e
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 16 13:00:24 2017 -0500

    fb: Remove unused fbGetFreeCompClip macro
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/fb/fb.h b/fb/fb.h
index d5db710..2e8770d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -462,7 +462,6 @@ typedef struct {
 
 #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 #define fbGetExpose(pGC)	((pGC)->fExpose)
-#define fbGetFreeCompClip(pGC)	((pGC)->freeCompClip)
 #define fbGetRotatedPixmap(pGC)	((pGC)->pRotatedPixmap)
 
 #define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
commit 706e6d9cd074da606016ed4ecff51e9c2a822087
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 16 13:00:24 2017 -0500

    wfb: Hide init function decls behind FB_ACCESS_WRAPPER
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/fb/fb.h b/fb/fb.h
index c687aa7..d5db710 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1192,8 +1192,8 @@ extern _X_EXPORT Bool
                int dpiy, int width,     /* pixel width of frame buffer */
                int bpp);        /* bits per pixel of frame buffer */
 
+#ifdef FB_ACCESS_WRAPPER
 extern _X_EXPORT Bool
-
 wfbFinishScreenInit(ScreenPtr pScreen,
                     void *pbits,
                     int xsize,
@@ -1205,7 +1205,6 @@ wfbFinishScreenInit(ScreenPtr pScreen,
                     SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
 
 extern _X_EXPORT Bool
-
 wfbScreenInit(ScreenPtr pScreen,
               void *pbits,
               int xsize,
@@ -1215,9 +1214,9 @@ wfbScreenInit(ScreenPtr pScreen,
               int width,
               int bpp,
               SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
+#endif
 
 extern _X_EXPORT Bool
-
 fbFinishScreenInit(ScreenPtr pScreen,
                    void *pbits,
                    int xsize,
commit 790c1c0b10968776440a962e1fc6d1d3157b1559
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Feb 16 13:00:24 2017 -0500

    wfb: Add missing rename for fbGlyphs
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index baa80f8..4c99ee5 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -74,6 +74,7 @@
 #define fbGlyph24 wfbGlyph24
 #define fbGlyph32 wfbGlyph32
 #define fbGlyph8 wfbGlyph8
+#define fbGlyphs wfbGlyphs
 #define fbHasVisualTypes wfbHasVisualTypes
 #define fbImageGlyphBlt wfbImageGlyphBlt
 #define fbIn wfbIn