Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/dpms.c
	xorg-server/Xext/saver.c
	xorg-server/Xext/security.c
	xorg-server/Xext/shape.c
	xorg-server/Xext/sync.c
	xorg-server/Xi/opendev.c
	xorg-server/fb/wfbrename.h
	xorg-server/glx/glxserver.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/mi/miarc.c
	xorg-server/mi/miwideline.c
	xorg-server/os/io.c
	xorg-server/render/mipict.c

1 files changed, 171 insertions, 169 deletions

diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h
index 5dee3bc4a..1a072045e 100644
--- a/xorg-server/fb/wfbrename.h
+++ b/xorg-server/fb/wfbrename.h
@@ -1,169 +1,171 @@
-#define fb16Lane wfb16Lane

-#define fb24_32CopyMtoN wfb24_32CopyMtoN

-#define fb24_32CreateScreenResources wfb24_32CreateScreenResources

-#define fb24_32GetImage wfb24_32GetImage

-#define fb24_32GetSpans wfb24_32GetSpans

-#define fb24_32ModifyPixmapHeader wfb24_32ModifyPixmapHeader

-#define fb24_32PutZImage wfb24_32PutZImage

-#define fb24_32ReformatTile wfb24_32ReformatTile

-#define fb24_32SetSpans wfb24_32SetSpans

-#define fb32Lane wfb32Lane

-#define fb8Lane wfb8Lane

-#define fbAddTraps wfbAddTraps

-#define fbAddTriangles wfbAddTriangles

-#define fbAllocatePrivates wfbAllocatePrivates

-#define fbArc16 wfbArc16

-#define fbArc24 wfbArc24

-#define fbArc32 wfbArc32

-#define fbArc8 wfbArc8

-#define fbBlt wfbBlt

-#define fbBlt24 wfbBlt24

-#define fbBltOne wfbBltOne

-#define fbBltOne24 wfbBltOne24

-#define fbBltPlane wfbBltPlane

-#define fbBltStip wfbBltStip

-#define fbBres wfbBres

-#define fbBresDash wfbBresDash

-#define fbBresDash16 wfbBresDash16

-#define fbBresDash24 wfbBresDash24

-#define fbBresDash32 wfbBresDash32

-#define fbBresDash8 wfbBresDash8

-#define fbBresFill wfbBresFill

-#define fbBresFillDash wfbBresFillDash

-#define fbBresSolid wfbBresSolid

-#define fbBresSolid16 wfbBresSolid16

-#define fbBresSolid24 wfbBresSolid24

-#define fbBresSolid32 wfbBresSolid32

-#define fbBresSolid8 wfbBresSolid8

-#define fbChangeWindowAttributes wfbChangeWindowAttributes

-#define fbClearVisualTypes wfbClearVisualTypes

-#define fbCloseScreen wfbCloseScreen

-#define fbComposite wfbComposite

-#define fbCopy1toN wfbCopy1toN

-#define fbCopyArea wfbCopyArea

-#define fbCopyNto1 wfbCopyNto1

-#define fbCopyNtoN wfbCopyNtoN

-#define fbCopyPlane wfbCopyPlane

-#define fbCopyWindow wfbCopyWindow

-#define fbCopyWindowProc wfbCopyWindowProc

-#define fbCreateDefColormap wfbCreateDefColormap

-#define fbCreateGC wfbCreateGC

-#define fbCreatePixmap wfbCreatePixmap

-#define fbCreatePixmapBpp wfbCreatePixmapBpp

-#define fbCreateWindow wfbCreateWindow

-#define fbDestroyPixmap wfbDestroyPixmap

-#define fbDestroyWindow wfbDestroyWindow

-#define fbDots wfbDots

-#define fbDots16 wfbDots16

-#define fbDots24 wfbDots24

-#define fbDots32 wfbDots32

-#define fbDots8 wfbDots8

-#define fbEvenStipple wfbEvenStipple

-#define fbEvenTile wfbEvenTile

-#define fbExpandDirectColors wfbExpandDirectColors

-#define fbFill wfbFill

-#define fbFillRegionSolid wfbFillRegionSolid

-#define fbFillSpans wfbFillSpans

-#define fbFixCoordModePrevious wfbFixCoordModePrevious

-#define fbGCFuncs wfbGCFuncs

-#define fbGCOps wfbGCOps

-#define fbGCPrivateKeyRec wfbGCPrivateKeyRec

-#define fbGeneration wfbGeneration

-#define fbGetGCPrivateKey wfbGetGCPrivateKey

-#define fbGetImage wfbGetImage

-#define fbGetScreenPrivateKey wfbGetScreenPrivateKey

-#define fbGetSpans wfbGetSpans

-#define _fbGetWindowPixmap _wfbGetWindowPixmap

-#define fbWinPrivateKeyRec wfbWinPrivateKeyRec

-#define fbGetWinPrivateKey wfbGetWinPrivateKey

-#define fbGlyph16 wfbGlyph16

-#define fbGlyph24 wfbGlyph24

-#define fbGlyph32 wfbGlyph32

-#define fbGlyph8 wfbGlyph8

-#define fbGlyphIn wfbGlyphIn

-#define fbHasVisualTypes wfbHasVisualTypes

-#define fbImageGlyphBlt wfbImageGlyphBlt

-#define fbIn wfbIn

-#define fbInitializeColormap wfbInitializeColormap

-#define fbInitVisuals wfbInitVisuals

-#define fbInstallColormap wfbInstallColormap

-#define fbLaneTable wfbLaneTable

-#define fbListInstalledColormaps wfbListInstalledColormaps

-#define fbMapWindow wfbMapWindow

-#define FbMergeRopBits wFbMergeRopBits

-#define fbOddStipple wfbOddStipple

-#define fbOddTile wfbOddTile

-#define fbOver wfbOver

-#define fbOver24 wfbOver24

-#define fbOverlayCloseScreen wfbOverlayCloseScreen

-#define fbOverlayCopyWindow wfbOverlayCopyWindow

-#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources

-#define fbOverlayCreateWindow wfbOverlayCreateWindow

-#define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit

-#define fbOverlayGeneration wfbOverlayGeneration

-#define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey

-#define fbOverlayPaintKey wfbOverlayPaintKey

-#define fbOverlaySetupScreen wfbOverlaySetupScreen

-#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion

-#define fbOverlayWindowExposures wfbOverlayWindowExposures

-#define fbOverlayWindowLayer wfbOverlayWindowLayer

-#define fbPadPixmap wfbPadPixmap

-#define fbPictureInit wfbPictureInit

-#define fbPixmapToRegion wfbPixmapToRegion

-#define fbPolyArc wfbPolyArc

-#define fbPolyFillRect wfbPolyFillRect

-#define fbPolyGlyphBlt wfbPolyGlyphBlt

-#define fbPolyLine wfbPolyLine

-#define fbPolyline16 wfbPolyline16

-#define fbPolyline24 wfbPolyline24

-#define fbPolyline32 wfbPolyline32

-#define fbPolyline8 wfbPolyline8

-#define fbPolyPoint wfbPolyPoint

-#define fbPolySegment wfbPolySegment

-#define fbPolySegment16 wfbPolySegment16

-#define fbPolySegment24 wfbPolySegment24

-#define fbPolySegment32 wfbPolySegment32

-#define fbPolySegment8 wfbPolySegment8

-#define fbPositionWindow wfbPositionWindow

-#define fbPushFill wfbPushFill

-#define fbPushImage wfbPushImage

-#define fbPushPattern wfbPushPattern

-#define fbPushPixels wfbPushPixels

-#define fbPutImage wfbPutImage

-#define fbPutXYImage wfbPutXYImage

-#define fbPutZImage wfbPutZImage

-#define fbQueryBestSize wfbQueryBestSize

-#define fbRasterizeTrapezoid wfbRasterizeTrapezoid

-#define fbRealizeFont wfbRealizeFont

-#define fbReduceRasterOp wfbReduceRasterOp

-#define fbReplicatePixel wfbReplicatePixel

-#define fbResolveColor wfbResolveColor

-#define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec

-#define fbSegment wfbSegment

-#define fbSelectBres wfbSelectBres

-#define fbSetSpans wfbSetSpans

-#define fbSetupScreen wfbSetupScreen

-#define fbSetVisualTypes wfbSetVisualTypes

-#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks

-#define _fbSetWindowPixmap _wfbSetWindowPixmap

-#define fbSolid wfbSolid

-#define fbSolid24 wfbSolid24

-#define fbSolidBoxClipped wfbSolidBoxClipped

-#define fbStipple wfbStipple

-#define fbStipple1Bits wfbStipple1Bits

-#define fbStipple24Bits wfbStipple24Bits

-#define fbStipple2Bits wfbStipple2Bits

-#define fbStipple4Bits wfbStipple4Bits

-#define fbStipple8Bits wfbStipple8Bits

-#define fbStippleTable wfbStippleTable

-#define fbTile wfbTile

-#define fbTransparentSpan wfbTransparentSpan

-#define fbUninstallColormap wfbUninstallColormap

-#define fbUnmapWindow wfbUnmapWindow

-#define fbUnrealizeFont wfbUnrealizeFont

-#define fbValidateGC wfbValidateGC

-#define fbWinPrivateKeyRec wfbWinPrivateKeyRec

-#define fbZeroLine wfbZeroLine

-#define fbZeroSegment wfbZeroSegment

-#define free_pixman_pict wfb_free_pixman_pict

-#define image_from_pict wfb_image_from_pict

+#define fb16Lane wfb16Lane
+#define fb24_32CopyMtoN wfb24_32CopyMtoN
+#define fb24_32CreateScreenResources wfb24_32CreateScreenResources
+#define fb24_32GetImage wfb24_32GetImage
+#define fb24_32GetSpans wfb24_32GetSpans
+#define fb24_32ModifyPixmapHeader wfb24_32ModifyPixmapHeader
+#define fb24_32PutZImage wfb24_32PutZImage
+#define fb24_32ReformatTile wfb24_32ReformatTile
+#define fb24_32SetSpans wfb24_32SetSpans
+#define fb32Lane wfb32Lane
+#define fb8Lane wfb8Lane
+#define fbAddTraps wfbAddTraps
+#define fbAddTriangles wfbAddTriangles
+#define fbAllocatePrivates wfbAllocatePrivates
+#define fbArc16 wfbArc16
+#define fbArc24 wfbArc24
+#define fbArc32 wfbArc32
+#define fbArc8 wfbArc8
+#define fbBlt wfbBlt
+#define fbBlt24 wfbBlt24
+#define fbBltOne wfbBltOne
+#define fbBltOne24 wfbBltOne24
+#define fbBltPlane wfbBltPlane
+#define fbBltStip wfbBltStip
+#define fbBres wfbBres
+#define fbBresDash wfbBresDash
+#define fbBresDash16 wfbBresDash16
+#define fbBresDash24 wfbBresDash24
+#define fbBresDash32 wfbBresDash32
+#define fbBresDash8 wfbBresDash8
+#define fbBresFill wfbBresFill
+#define fbBresFillDash wfbBresFillDash
+#define fbBresSolid wfbBresSolid
+#define fbBresSolid16 wfbBresSolid16
+#define fbBresSolid24 wfbBresSolid24
+#define fbBresSolid32 wfbBresSolid32
+#define fbBresSolid8 wfbBresSolid8
+#define fbChangeWindowAttributes wfbChangeWindowAttributes
+#define fbClearVisualTypes wfbClearVisualTypes
+#define fbCloseScreen wfbCloseScreen
+#define fbComposite wfbComposite
+#define fbCopy1toN wfbCopy1toN
+#define fbCopyArea wfbCopyArea
+#define fbCopyNto1 wfbCopyNto1
+#define fbCopyNtoN wfbCopyNtoN
+#define fbCopyPlane wfbCopyPlane
+#define fbCopyWindow wfbCopyWindow
+#define fbCopyWindowProc wfbCopyWindowProc
+#define fbCreateDefColormap wfbCreateDefColormap
+#define fbCreateGC wfbCreateGC
+#define fbCreatePixmap wfbCreatePixmap
+#define fbCreatePixmapBpp wfbCreatePixmapBpp
+#define fbCreateWindow wfbCreateWindow
+#define fbDestroyPixmap wfbDestroyPixmap
+#define fbDestroyWindow wfbDestroyWindow
+#define fbDots wfbDots
+#define fbDots16 wfbDots16
+#define fbDots24 wfbDots24
+#define fbDots32 wfbDots32
+#define fbDots8 wfbDots8
+#define fbEvenStipple wfbEvenStipple
+#define fbEvenTile wfbEvenTile
+#define fbExpandDirectColors wfbExpandDirectColors
+#define fbFill wfbFill
+#define fbFillRegionSolid wfbFillRegionSolid
+#define fbFillSpans wfbFillSpans
+#define fbFixCoordModePrevious wfbFixCoordModePrevious
+#define fbGCFuncs wfbGCFuncs
+#define fbGCOps wfbGCOps
+#define fbGCPrivateKeyRec wfbGCPrivateKeyRec
+#define fbGeneration wfbGeneration
+#define fbGetGCPrivateKey wfbGetGCPrivateKey
+#define fbGetImage wfbGetImage
+#define fbGetScreenPrivateKey wfbGetScreenPrivateKey
+#define fbGetSpans wfbGetSpans
+#define _fbGetWindowPixmap _wfbGetWindowPixmap
+#define fbWinPrivateKeyRec wfbWinPrivateKeyRec
+#define fbGetWinPrivateKey wfbGetWinPrivateKey
+#define fbGlyph16 wfbGlyph16
+#define fbGlyph24 wfbGlyph24
+#define fbGlyph32 wfbGlyph32
+#define fbGlyph8 wfbGlyph8
+#define fbGlyphIn wfbGlyphIn
+#define fbHasVisualTypes wfbHasVisualTypes
+#define fbImageGlyphBlt wfbImageGlyphBlt
+#define fbIn wfbIn
+#define fbInitializeColormap wfbInitializeColormap
+#define fbInitVisuals wfbInitVisuals
+#define fbInstallColormap wfbInstallColormap
+#define fbLaneTable wfbLaneTable
+#define fbListInstalledColormaps wfbListInstalledColormaps
+#define fbMapWindow wfbMapWindow
+#define FbMergeRopBits wFbMergeRopBits
+#define fbOddStipple wfbOddStipple
+#define fbOddTile wfbOddTile
+#define fbOver wfbOver
+#define fbOver24 wfbOver24
+#define fbOverlayCloseScreen wfbOverlayCloseScreen
+#define fbOverlayCopyWindow wfbOverlayCopyWindow
+#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources
+#define fbOverlayCreateWindow wfbOverlayCreateWindow
+#define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit
+#define fbOverlayGeneration wfbOverlayGeneration
+#define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey
+#define fbOverlayPaintKey wfbOverlayPaintKey
+#define fbOverlaySetupScreen wfbOverlaySetupScreen
+#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion
+#define fbOverlayWindowExposures wfbOverlayWindowExposures
+#define fbOverlayWindowLayer wfbOverlayWindowLayer
+#define fbPadPixmap wfbPadPixmap
+#define fbPictureInit wfbPictureInit
+#define fbPixmapToRegion wfbPixmapToRegion
+#define fbPolyArc wfbPolyArc
+#define fbPolyFillRect wfbPolyFillRect
+#define fbPolyGlyphBlt wfbPolyGlyphBlt
+#define fbPolyLine wfbPolyLine
+#define fbPolyline16 wfbPolyline16
+#define fbPolyline24 wfbPolyline24
+#define fbPolyline32 wfbPolyline32
+#define fbPolyline8 wfbPolyline8
+#define fbPolyPoint wfbPolyPoint
+#define fbPolySegment wfbPolySegment
+#define fbPolySegment16 wfbPolySegment16
+#define fbPolySegment24 wfbPolySegment24
+#define fbPolySegment32 wfbPolySegment32
+#define fbPolySegment8 wfbPolySegment8
+#define fbPositionWindow wfbPositionWindow
+#define fbPushFill wfbPushFill
+#define fbPushImage wfbPushImage
+#define fbPushPattern wfbPushPattern
+#define fbPushPixels wfbPushPixels
+#define fbPutImage wfbPutImage
+#define fbPutXYImage wfbPutXYImage
+#define fbPutZImage wfbPutZImage
+#define fbQueryBestSize wfbQueryBestSize
+#define fbRasterizeTrapezoid wfbRasterizeTrapezoid
+#define fbRealizeFont wfbRealizeFont
+#define fbReduceRasterOp wfbReduceRasterOp
+#define fbReplicatePixel wfbReplicatePixel
+#define fbResolveColor wfbResolveColor
+#define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec
+#define fbSegment wfbSegment
+#define fbSelectBres wfbSelectBres
+#define fbSetSpans wfbSetSpans
+#define fbSetupScreen wfbSetupScreen
+#define fbSetVisualTypes wfbSetVisualTypes
+#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks
+#define _fbSetWindowPixmap _wfbSetWindowPixmap
+#define fbSolid wfbSolid
+#define fbSolid24 wfbSolid24
+#define fbSolidBoxClipped wfbSolidBoxClipped
+#define fbStipple wfbStipple
+#define fbStipple1Bits wfbStipple1Bits
+#define fbStipple24Bits wfbStipple24Bits
+#define fbStipple2Bits wfbStipple2Bits
+#define fbStipple4Bits wfbStipple4Bits
+#define fbStipple8Bits wfbStipple8Bits
+#define fbStippleTable wfbStippleTable
+#define fbTile wfbTile
+#define fbTransparentSpan wfbTransparentSpan
+#define fbTrapezoids wfbTrapezoids
+#define fbTriangles wfbTriangles
+#define fbUninstallColormap wfbUninstallColormap
+#define fbUnmapWindow wfbUnmapWindow
+#define fbUnrealizeFont wfbUnrealizeFont
+#define fbValidateGC wfbValidateGC
+#define fbWinPrivateKeyRec wfbWinPrivateKeyRec
+#define fbZeroLine wfbZeroLine
+#define fbZeroSegment wfbZeroSegment
+#define free_pixman_pict wfb_free_pixman_pict
+#define image_from_pict wfb_image_from_pict