recreated tag libreoffice-3.3.3.1 which had these commits:

commit 409e4c7d568deb2a0ee670a4345ff579712d3225 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue May 31 17:39:06 2011 +0200

Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)

commit 896c49083aec918b0710f9c62f2f775a53f28057
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Feb 9 14:55:17 2011 +0000

Resolves: rhbz#675806 crash in es thesaurus
(cherry picked from commit b788f9fc846c0f47d02df02ac6733c0ac21a13c6)

mythes/makefile.mk                   |    6 ++++--
mythes/mythes-1.2.1-rhbz675806.patch |   10 ++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)

8 files changed, 753 insertions, 753 deletions

diff --git a/x11_extensions/inc/Xrandr.h b/x11_extensions/inc/Xrandr.h
index 3cf2a674760f..2f0cb7e86af7 100644
--- a/x11_extensions/inc/Xrandr.h
+++ b/x11_extensions/inc/Xrandr.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Jim Gettys, HP Labs, HP.
@@ -33,10 +33,10 @@
 
 _XFUNCPROTOBEGIN
 
-
+    
 typedef struct {
-    int width, height;
-    int mwidth, mheight;
+    int	width, height;
+    int	mwidth, mheight;
 } XRRScreenSize;
 
 /*
@@ -44,14 +44,14 @@ typedef struct {
  */
 
 typedef struct {
-    int type;           /* event base */
-    unsigned long serial;   /* # of last request processed by server */
-    Bool send_event;        /* true if this came from a SendEvent request */
-    Display *display;       /* Display the event was read from */
-    Window window;      /* window which selected for this event */
-    Window root;        /* Root window for changed screen */
-    Time timestamp;     /* when the screen change occurred */
-    Time config_timestamp;  /* when the last configuration change */
+    int type;			/* event base */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came from a SendEvent request */
+    Display *display;		/* Display the event was read from */
+    Window window;		/* window which selected for this event */
+    Window root;		/* Root window for changed screen */
+    Time timestamp;		/* when the screen change occurred */
+    Time config_timestamp;	/* when the last configuration change */
     SizeID size_index;
     SubpixelOrder subpixel_order;
     Rotation rotation;
@@ -63,7 +63,7 @@ typedef struct {
 
 
 /* internal representation is private to the library */
-typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
+typedef struct _XRRScreenConfiguration XRRScreenConfiguration;	
 
 Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
 Status XRRQueryVersion (Display *dpy,
@@ -72,17 +72,17 @@ Status XRRQueryVersion (Display *dpy,
 
 XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy,
                       Drawable draw);
-
+    
 void XRRFreeScreenConfigInfo (XRRScreenConfiguration *config);
 
-/*
+/* 
  * Note that screen configuration changes are only permitted if the client can
  * prove it has up to date configuration information.  We are trying to
  * insist that it become possible for screens to change dynamically, so
  * we want to ensure the client knows what it is talking about when requesting
  * changes.
  */
-Status XRRSetScreenConfig (Display *dpy,
+Status XRRSetScreenConfig (Display *dpy, 
                XRRScreenConfiguration *config,
                Drawable draw,
                int size_index,
@@ -90,7 +90,7 @@ Status XRRSetScreenConfig (Display *dpy,
                Time timestamp);
 
 /* added in v1.1, sorry for the lame name */
-Status XRRSetScreenConfigAndRate (Display *dpy,
+Status XRRSetScreenConfigAndRate (Display *dpy, 
                   XRRScreenConfiguration *config,
                   Drawable draw,
                   int size_index,
@@ -107,14 +107,14 @@ XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes);
 
 short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates);
 
-SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config,
+SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config, 
                   Rotation *rotation);
-
+    
 short XRRConfigCurrentRate (XRRScreenConfiguration *config);
 
 int XRRRootToScreen(Display *dpy, Window root);
 
-/*
+/* 
  * returns the screen configuration for the specified screen; does a lazy
  * evalution to delay getting the information, and caches the result.
  * These routines should be used in preference to XRRGetScreenInfo
@@ -127,9 +127,9 @@ XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen);
 XRRScreenConfiguration *XRRConfig(Screen *screen);
 void XRRSelectInput(Display *dpy, Window window, int mask);
 
-/*
- * the following are always safe to call, even if RandR is not implemented
- * on a screen
+/* 
+ * the following are always safe to call, even if RandR is not implemented 
+ * on a screen 
  */
 
 
@@ -139,8 +139,8 @@ short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates);
 Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
 
 
-/*
- * intended to take RRScreenChangeNotify,  or
+/* 
+ * intended to take RRScreenChangeNotify,  or 
  * ConfigureNotify (on the root window)
  * returns 1 if it is an event type it understands, 0 if not
  */
diff --git a/x11_extensions/inc/Xrender.h b/x11_extensions/inc/Xrender.h
index 1b3bc939f24e..73a654ac4179 100644
--- a/x11_extensions/inc/Xrender.h
+++ b/x11_extensions/inc/Xrender.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Keith Packard, SuSE, Inc.
@@ -44,40 +44,40 @@ typedef struct {
 } XRenderDirectFormat;
 
 typedef struct {
-    PictFormat      id;
-    int         type;
-    int         depth;
-    XRenderDirectFormat direct;
-    Colormap        colormap;
+    PictFormat		id;
+    int			type;
+    int			depth;
+    XRenderDirectFormat	direct;
+    Colormap		colormap;
 } XRenderPictFormat;
 
-#define PictFormatID        (1 << 0)
-#define PictFormatType      (1 << 1)
-#define PictFormatDepth     (1 << 2)
-#define PictFormatRed       (1 << 3)
+#define PictFormatID	    (1 << 0)
+#define PictFormatType	    (1 << 1)
+#define PictFormatDepth	    (1 << 2)
+#define PictFormatRed	    (1 << 3)
 #define PictFormatRedMask   (1 << 4)
-#define PictFormatGreen     (1 << 5)
+#define PictFormatGreen	    (1 << 5)
 #define PictFormatGreenMask (1 << 6)
-#define PictFormatBlue      (1 << 7)
+#define PictFormatBlue	    (1 << 7)
 #define PictFormatBlueMask  (1 << 8)
-#define PictFormatAlpha     (1 << 9)
+#define PictFormatAlpha	    (1 << 9)
 #define PictFormatAlphaMask (1 << 10)
 #define PictFormatColormap  (1 << 11)
 
 typedef struct _XRenderPictureAttributes {
-    int         repeat;
-    Picture     alpha_map;
-    int         alpha_x_origin;
-    int         alpha_y_origin;
-    int         clip_x_origin;
-    int         clip_y_origin;
-    Pixmap      clip_mask;
-    Bool        graphics_exposures;
-    int         subwindow_mode;
-    int         poly_edge;
-    int         poly_mode;
-    Atom        dither;
-    Bool        component_alpha;
+    int 		repeat;
+    Picture		alpha_map;
+    int			alpha_x_origin;
+    int			alpha_y_origin;
+    int			clip_x_origin;
+    int			clip_y_origin;
+    Pixmap		clip_mask;
+    Bool		graphics_exposures;
+    int			subwindow_mode;
+    int			poly_edge;
+    int			poly_mode;
+    Atom		dither;
+    Bool		component_alpha;
 } XRenderPictureAttributes;
 
 typedef struct {
@@ -90,37 +90,37 @@ typedef struct {
 typedef struct _XGlyphInfo {
     unsigned short  width;
     unsigned short  height;
-    short       x;
-    short       y;
-    short       xOff;
-    short       yOff;
+    short	    x;
+    short	    y;
+    short	    xOff;
+    short	    yOff;
 } XGlyphInfo;
 
 typedef struct _XGlyphElt8 {
-    GlyphSet            glyphset;
-    _Xconst char        *chars;
-    int             nchars;
-    int             xOff;
-    int             yOff;
+    GlyphSet		    glyphset;
+    _Xconst char	    *chars;
+    int			    nchars;
+    int			    xOff;
+    int			    yOff;
 } XGlyphElt8;
 
 typedef struct _XGlyphElt16 {
-    GlyphSet            glyphset;
+    GlyphSet		    glyphset;
     _Xconst unsigned short  *chars;
-    int             nchars;
-    int             xOff;
-    int             yOff;
+    int			    nchars;
+    int			    xOff;
+    int			    yOff;
 } XGlyphElt16;
 
 typedef struct _XGlyphElt32 {
-    GlyphSet            glyphset;
+    GlyphSet		    glyphset;
     _Xconst unsigned int    *chars;
-    int             nchars;
-    int             xOff;
-    int             yOff;
+    int			    nchars;
+    int			    xOff;
+    int			    yOff;
 } XGlyphElt32;
 
-typedef double  XDouble;
+typedef double	XDouble;
 
 typedef struct _XPointDouble {
     XDouble  x, y;
@@ -136,11 +136,11 @@ typedef struct _XPointFixed {
 } XPointFixed;
 
 typedef struct _XLineFixed {
-    XPointFixed p1, p2;
+    XPointFixed	p1, p2;
 } XLineFixed;
 
 typedef struct _XTriangle {
-    XPointFixed p1, p2, p3;
+    XPointFixed	p1, p2, p3;
 } XTriangle;
 
 typedef struct _XCircle {
@@ -151,7 +151,7 @@ typedef struct _XCircle {
 
 typedef struct _XTrapezoid {
     XFixed  top, bottom;
-    XLineFixed  left, right;
+    XLineFixed	left, right;
 } XTrapezoid;
 
 typedef struct _XTransform {
@@ -159,9 +159,9 @@ typedef struct _XTransform {
 } XTransform;
 
 typedef struct _XFilters {
-    int     nfilter;
+    int	    nfilter;
     char    **filter;
-    int     nalias;
+    int	    nalias;
     short   *alias;
 } XFilters;
 
@@ -171,16 +171,16 @@ typedef struct _XIndexValue {
 } XIndexValue;
 
 typedef struct _XAnimCursor {
-    Cursor      cursor;
+    Cursor	    cursor;
     unsigned long   delay;
 } XAnimCursor;
 
 typedef struct _XSpanFix {
-    XFixed      left, right, y;
+    XFixed	    left, right, y;
 } XSpanFix;
 
 typedef struct _XTrap {
-    XSpanFix        top, bottom;
+    XSpanFix	    top, bottom;
 } XTrap;
 
 typedef struct _XLinearGradient {
@@ -216,57 +216,57 @@ XRenderPictFormat *
 XRenderFindVisualFormat (Display *dpy, _Xconst Visual *visual);
 
 XRenderPictFormat *
-XRenderFindFormat (Display          *dpy,
-           unsigned long        mask,
-           _Xconst XRenderPictFormat    *templ,
-           int              count);
-
+XRenderFindFormat (Display			*dpy,
+           unsigned long		mask,
+           _Xconst XRenderPictFormat	*templ,
+           int				count);
+    
 #define PictStandardARGB32  0
 #define PictStandardRGB24   1
-#define PictStandardA8      2
-#define PictStandardA4      3
-#define PictStandardA1      4
-#define PictStandardNUM     5
+#define PictStandardA8	    2
+#define PictStandardA4	    3
+#define PictStandardA1	    4
+#define PictStandardNUM	    5
 
 XRenderPictFormat *
-XRenderFindStandardFormat (Display      *dpy,
-               int          format);
+XRenderFindStandardFormat (Display		*dpy,
+               int			format);
 
 XIndexValue *
-XRenderQueryPictIndexValues(Display         *dpy,
-                _Xconst XRenderPictFormat   *format,
-                int             *num);
+XRenderQueryPictIndexValues(Display			*dpy,
+                _Xconst XRenderPictFormat	*format,
+                int				*num);
 
 Picture
-XRenderCreatePicture (Display               *dpy,
-              Drawable              drawable,
-              _Xconst XRenderPictFormat     *format,
-              unsigned long         valuemask,
-              _Xconst XRenderPictureAttributes  *attributes);
+XRenderCreatePicture (Display				*dpy,
+              Drawable				drawable,
+              _Xconst XRenderPictFormat		*format,
+              unsigned long			valuemask,
+              _Xconst XRenderPictureAttributes	*attributes);
 
 void
-XRenderChangePicture (Display               *dpy,
-              Picture               picture,
-              unsigned long         valuemask,
+XRenderChangePicture (Display				*dpy,
+              Picture				picture,
+              unsigned long			valuemask,
               _Xconst XRenderPictureAttributes  *attributes);
 
 void
-XRenderSetPictureClipRectangles (Display        *dpy,
-                 Picture        picture,
-                 int            xOrigin,
-                 int            yOrigin,
+XRenderSetPictureClipRectangles (Display	    *dpy,
+                 Picture	    picture,
+                 int		    xOrigin,
+                 int		    yOrigin,
                  _Xconst XRectangle *rects,
-                 int            n);
+                 int		    n);
 
 void
-XRenderSetPictureClipRegion (Display        *dpy,
-                 Picture        picture,
-                 Region     r);
+XRenderSetPictureClipRegion (Display	    *dpy,
+                 Picture	    picture,
+                 Region	    r);
 
 void
-XRenderSetPictureTransform (Display     *dpy,
-                Picture     picture,
-                XTransform      *transform);
+XRenderSetPictureTransform (Display	    *dpy,
+                Picture	    picture,
+                XTransform	    *transform);
 
 void
 XRenderFreePicture (Display                   *dpy,
@@ -274,18 +274,18 @@ XRenderFreePicture (Display                   *dpy,
 
 void
 XRenderComposite (Display   *dpy,
-          int       op,
+          int	    op,
           Picture   src,
           Picture   mask,
           Picture   dst,
-          int       src_x,
-          int       src_y,
-          int       mask_x,
-          int       mask_y,
-          int       dst_x,
-          int       dst_y,
-          unsigned int  width,
-          unsigned int  height);
+          int	    src_x,
+          int	    src_y,
+          int	    mask_x,
+          int	    mask_y,
+          int	    dst_x,
+          int	    dst_y,
+          unsigned int	width,
+          unsigned int	height);
 
 GlyphSet
 XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format);
@@ -297,184 +297,184 @@ void
 XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset);
 
 void
-XRenderAddGlyphs (Display       *dpy,
-          GlyphSet      glyphset,
-          _Xconst Glyph     *gids,
-          _Xconst XGlyphInfo    *glyphs,
-          int           nglyphs,
-          _Xconst char      *images,
-          int           nbyte_images);
+XRenderAddGlyphs (Display		*dpy,
+          GlyphSet		glyphset,
+          _Xconst Glyph		*gids,
+          _Xconst XGlyphInfo	*glyphs,
+          int			nglyphs,
+          _Xconst char		*images,
+          int			nbyte_images);
 
 void
-XRenderFreeGlyphs (Display      *dpy,
-           GlyphSet     glyphset,
+XRenderFreeGlyphs (Display	    *dpy,
+           GlyphSet	    glyphset,
            _Xconst Glyph    *gids,
-           int          nglyphs);
+           int		    nglyphs);
 
 void
-XRenderCompositeString8 (Display            *dpy,
-             int                op,
-             Picture            src,
-             Picture            dst,
+XRenderCompositeString8 (Display		    *dpy,
+             int			    op,
+             Picture		    src,
+             Picture		    dst,
              _Xconst XRenderPictFormat  *maskFormat,
-             GlyphSet           glyphset,
-             int                xSrc,
-             int                ySrc,
-             int                xDst,
-             int                yDst,
-             _Xconst char           *string,
-             int                nchar);
+             GlyphSet		    glyphset,
+             int			    xSrc,
+             int			    ySrc,
+             int			    xDst,
+             int			    yDst,
+             _Xconst char		    *string,
+             int			    nchar);
 
 void
-XRenderCompositeString16 (Display           *dpy,
-              int               op,
-              Picture           src,
-              Picture           dst,
+XRenderCompositeString16 (Display		    *dpy,
+              int			    op,
+              Picture		    src,
+              Picture		    dst,
               _Xconst XRenderPictFormat *maskFormat,
-              GlyphSet          glyphset,
-              int               xSrc,
-              int               ySrc,
-              int               xDst,
-              int               yDst,
+              GlyphSet		    glyphset,
+              int			    xSrc,
+              int			    ySrc,
+              int			    xDst,
+              int			    yDst,
               _Xconst unsigned short    *string,
-              int               nchar);
+              int			    nchar);
 
 void
-XRenderCompositeString32 (Display           *dpy,
-              int               op,
-              Picture           src,
-              Picture           dst,
+XRenderCompositeString32 (Display		    *dpy,
+              int			    op,
+              Picture		    src,
+              Picture		    dst,
               _Xconst XRenderPictFormat *maskFormat,
-              GlyphSet          glyphset,
-              int               xSrc,
-              int               ySrc,
-              int               xDst,
-              int               yDst,
-              _Xconst unsigned int      *string,
-              int               nchar);
+              GlyphSet		    glyphset,
+              int			    xSrc,
+              int			    ySrc,
+              int			    xDst,
+              int			    yDst,
+              _Xconst unsigned int	    *string,
+              int			    nchar);
 
 void
-XRenderCompositeText8 (Display              *dpy,
-               int              op,
-               Picture              src,
-               Picture              dst,
+XRenderCompositeText8 (Display			    *dpy,
+               int			    op,
+               Picture			    src,
+               Picture			    dst,
                _Xconst XRenderPictFormat    *maskFormat,
-               int              xSrc,
-               int              ySrc,
-               int              xDst,
-               int              yDst,
-               _Xconst XGlyphElt8       *elts,
-               int              nelt);
+               int			    xSrc,
+               int			    ySrc,
+               int			    xDst,
+               int			    yDst,
+               _Xconst XGlyphElt8	    *elts,
+               int			    nelt);
 
 void
-XRenderCompositeText16 (Display             *dpy,
-            int             op,
-            Picture             src,
-            Picture             dst,
+XRenderCompositeText16 (Display			    *dpy,
+            int			    op,
+            Picture			    src,
+            Picture			    dst,
             _Xconst XRenderPictFormat   *maskFormat,
-            int             xSrc,
-            int             ySrc,
-            int             xDst,
-            int             yDst,
-            _Xconst XGlyphElt16     *elts,
-            int             nelt);
+            int			    xSrc,
+            int			    ySrc,
+            int			    xDst,
+            int			    yDst,
+            _Xconst XGlyphElt16	    *elts,
+            int			    nelt);
 
 void
-XRenderCompositeText32 (Display             *dpy,
-            int             op,
-            Picture             src,
-            Picture             dst,
+XRenderCompositeText32 (Display			    *dpy,
+            int			    op,
+            Picture			    src,
+            Picture			    dst,
             _Xconst XRenderPictFormat   *maskFormat,
-            int             xSrc,
-            int             ySrc,
-            int             xDst,
-            int             yDst,
-            _Xconst XGlyphElt32     *elts,
-            int             nelt);
+            int			    xSrc,
+            int			    ySrc,
+            int			    xDst,
+            int			    yDst,
+            _Xconst XGlyphElt32	    *elts,
+            int			    nelt);
 
 void
-XRenderFillRectangle (Display           *dpy,
-              int           op,
-              Picture           dst,
+XRenderFillRectangle (Display		    *dpy,
+              int		    op,
+              Picture		    dst,
               _Xconst XRenderColor  *color,
-              int           x,
-              int           y,
-              unsigned int      width,
-              unsigned int      height);
+              int		    x,
+              int		    y,
+              unsigned int	    width,
+              unsigned int	    height);
 
 void
-XRenderFillRectangles (Display          *dpy,
-               int          op,
-               Picture          dst,
+XRenderFillRectangles (Display		    *dpy,
+               int		    op,
+               Picture		    dst,
                _Xconst XRenderColor *color,
                _Xconst XRectangle   *rectangles,
-               int          n_rects);
+               int		    n_rects);
 
 void
-XRenderCompositeTrapezoids (Display     *dpy,
-                int         op,
-                Picture     src,
-                Picture     dst,
-                _Xconst XRenderPictFormat   *maskFormat,
-                int         xSrc,
-                int         ySrc,
-                _Xconst XTrapezoid  *traps,
-                int         ntrap);
+XRenderCompositeTrapezoids (Display		*dpy,
+                int			op,
+                Picture		src,
+                Picture		dst,
+                _Xconst XRenderPictFormat	*maskFormat,
+                int			xSrc,
+                int			ySrc,
+                _Xconst XTrapezoid	*traps,
+                int			ntrap);
 
 void
-XRenderCompositeTriangles (Display      *dpy,
-               int          op,
-               Picture      src,
-               Picture      dst,
-                _Xconst XRenderPictFormat   *maskFormat,
-               int          xSrc,
-               int          ySrc,
-               _Xconst XTriangle    *triangles,
-               int          ntriangle);
+XRenderCompositeTriangles (Display		*dpy,
+               int			op,
+               Picture		src,
+               Picture		dst,
+                _Xconst XRenderPictFormat	*maskFormat,
+               int			xSrc,
+               int			ySrc,
+               _Xconst XTriangle	*triangles,
+               int			ntriangle);
 
 void
-XRenderCompositeTriStrip (Display       *dpy,
-              int           op,
-              Picture       src,
-              Picture       dst,
-                _Xconst XRenderPictFormat   *maskFormat,
-              int           xSrc,
-              int           ySrc,
-              _Xconst XPointFixed   *points,
-              int           npoint);
+XRenderCompositeTriStrip (Display		*dpy,
+              int			op,
+              Picture		src,
+              Picture		dst,
+                _Xconst XRenderPictFormat	*maskFormat,
+              int			xSrc,
+              int			ySrc,
+              _Xconst XPointFixed	*points,
+              int			npoint);
 
 void
-XRenderCompositeTriFan (Display         *dpy,
-            int         op,
-            Picture         src,
-            Picture         dst,
-            _Xconst XRenderPictFormat   *maskFormat,
-            int         xSrc,
-            int         ySrc,
-            _Xconst XPointFixed *points,
-            int         npoint);
+XRenderCompositeTriFan (Display			*dpy,
+            int			op,
+            Picture			src,
+            Picture			dst,
+            _Xconst XRenderPictFormat	*maskFormat,
+            int			xSrc,
+            int			ySrc,
+            _Xconst XPointFixed	*points,
+            int			npoint);
 
 void
-XRenderCompositeDoublePoly (Display         *dpy,
-                int             op,
-                Picture         src,
-                Picture         dst,
-                _Xconst XRenderPictFormat   *maskFormat,
-                int             xSrc,
-                int             ySrc,
-                int             xDst,
-                int             yDst,
+XRenderCompositeDoublePoly (Display		    *dpy,
+                int			    op,
+                Picture		    src,
+                Picture		    dst,
+                _Xconst XRenderPictFormat	*maskFormat,
+                int			    xSrc,
+                int			    ySrc,
+                int			    xDst,
+                int			    yDst,
                 _Xconst XPointDouble    *fpoints,
-                int             npoints,
-                int             winding);
+                int			    npoints,
+                int			    winding);
 Status
-XRenderParseColor(Display   *dpy,
-          char      *spec,
-          XRenderColor  *def);
+XRenderParseColor(Display	*dpy, 
+          char		*spec,
+          XRenderColor	*def);
 
 Cursor
-XRenderCreateCursor (Display        *dpy,
-             Picture        source,
+XRenderCreateCursor (Display	    *dpy,
+             Picture	    source,
              unsigned int   x,
              unsigned int   y);
 
@@ -485,22 +485,22 @@ void
 XRenderSetPictureFilter (Display    *dpy,
              Picture    picture,
              const char *filter,
-             XFixed     *params,
-             int        nparams);
+             XFixed	    *params,
+             int	    nparams);
 
 Cursor
-XRenderCreateAnimCursor (Display    *dpy,
-             int        ncursor,
-             XAnimCursor    *cursors);
+XRenderCreateAnimCursor (Display	*dpy,
+             int		ncursor,
+             XAnimCursor	*cursors);
 
 
 void
-XRenderAddTraps (Display        *dpy,
-         Picture        picture,
-         int            xOff,
-         int            yOff,
-         _Xconst XTrap      *traps,
-         int            ntrap);
+XRenderAddTraps (Display	    *dpy,
+         Picture	    picture,
+         int		    xOff,
+         int		    yOff,
+         _Xconst XTrap	    *traps,
+         int		    ntrap);
 
 Picture XRenderCreateSolidFill (Display *dpy,
                                 const XRenderColor *color);
diff --git a/x11_extensions/inc/randr.h b/x11_extensions/inc/randr.h
index f4bc2eb096ff..864ddd4fade4 100644
--- a/x11_extensions/inc/randr.h
+++ b/x11_extensions/inc/randr.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
  *
- * Copyright © 2000, Compaq Computer Corporation,
+ * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
@@ -27,48 +27,48 @@
 #ifndef _RANDR_H_
 #define _RANDR_H_
 
-typedef unsigned short  Rotation;
-typedef unsigned short  SizeID;
-typedef unsigned short  SubpixelOrder;
+typedef unsigned short	Rotation;
+typedef unsigned short	SizeID;
+typedef unsigned short	SubpixelOrder;
 
-#define RANDR_NAME      "RANDR"
-#define RANDR_MAJOR     1
-#define RANDR_MINOR     1
+#define RANDR_NAME		"RANDR"
+#define RANDR_MAJOR		1
+#define RANDR_MINOR		1
 
-#define RRNumberErrors      0
-#define RRNumberEvents      1
+#define RRNumberErrors		0
+#define RRNumberEvents		1
 
-#define X_RRQueryVersion    0
+#define X_RRQueryVersion	0
 /* we skip 1 to make old clients fail pretty immediately */
-#define X_RROldGetScreenInfo    1
-#define X_RR1_0SetScreenConfig  2
+#define X_RROldGetScreenInfo	1
+#define X_RR1_0SetScreenConfig	2
 /* V1.0 apps share the same set screen config request id */
-#define X_RRSetScreenConfig 2
-#define X_RROldScreenChangeSelectInput  3
+#define X_RRSetScreenConfig	2
+#define X_RROldScreenChangeSelectInput	3
 /* 3 used to be ScreenChangeSelectInput; deprecated */
-#define X_RRSelectInput     4
-#define X_RRGetScreenInfo   5
+#define X_RRSelectInput		4
+#define X_RRGetScreenInfo	5
 
 /* used in XRRSelectInput */
 
 #define RRScreenChangeNotifyMask  (1L << 0)
 
-#define RRScreenChangeNotify    0
+#define RRScreenChangeNotify	0
 
 /* used in the rotation field; rotation and reflection in 0.1 proto. */
-#define RR_Rotate_0     1
-#define RR_Rotate_90        2
-#define RR_Rotate_180       4
-#define RR_Rotate_270       8
+#define RR_Rotate_0		1
+#define RR_Rotate_90		2
+#define RR_Rotate_180		4
+#define RR_Rotate_270		8
 
 /* new in 1.0 protocol, to allow reflection of screen */
 
-#define RR_Reflect_X        16
-#define RR_Reflect_Y        32
+#define RR_Reflect_X		16
+#define RR_Reflect_Y		32
 
-#define RRSetConfigSuccess      0
-#define RRSetConfigInvalidConfigTime    1
-#define RRSetConfigInvalidTime      2
-#define RRSetConfigFailed       3
+#define RRSetConfigSuccess		0
+#define RRSetConfigInvalidConfigTime	1
+#define RRSetConfigInvalidTime		2
+#define RRSetConfigFailed		3
 
-#endif  /* _RANDR_H_ */
+#endif	/* _RANDR_H_ */
diff --git a/x11_extensions/inc/randrproto.h b/x11_extensions/inc/randrproto.h
index 714cacda4ae2..04d62fc0476d 100644
--- a/x11_extensions/inc/randrproto.h
+++ b/x11_extensions/inc/randrproto.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Jim Gettys, Hewlett-Packard Company, Inc.
@@ -59,7 +59,7 @@ typedef struct {
 } xScreenSizes;
 #define sz_xScreenSizes 8
 
-/*
+/* 
  * requests and replies
  */
 
@@ -84,7 +84,7 @@ typedef struct {
     CARD32  pad4 B32;
     CARD32  pad5 B32;
 } xRRQueryVersionReply;
-#define sz_xRRQueryVersionReply 32
+#define sz_xRRQueryVersionReply	32
 
 typedef struct {
     CARD8   reqType;
@@ -94,7 +94,7 @@ typedef struct {
 } xRRGetScreenInfoReq;
 #define sz_xRRGetScreenInfoReq   8
 
-/*
+/* 
  * the xRRScreenInfoReply structure is followed by:
  *
  * the size information
@@ -116,7 +116,7 @@ typedef struct {
     CARD16  nrateEnts B16;
     CARD16  pad B16;
 } xRRGetScreenInfoReply;
-#define sz_xRRGetScreenInfoReply    32
+#define sz_xRRGetScreenInfoReply	32
 
 typedef struct {
     CARD8    reqType;
@@ -149,7 +149,7 @@ typedef struct {
     CARD8   status;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    Time    newTimestamp B32;
+    Time    newTimestamp B32;  
     Time    newConfigTimestamp B32;
     Window  root;
     CARD16  subpixelOrder B16;
@@ -175,21 +175,21 @@ typedef struct {
  * event
  */
 typedef struct {
-    CARD8 type;             /* always evBase + ScreenChangeNotify */
-    CARD8 rotation;         /* new rotation */
+    CARD8 type;				/* always evBase + ScreenChangeNotify */
+    CARD8 rotation;			/* new rotation */
     CARD16 sequenceNumber B16;
-    Time timestamp B32;         /* time screen was changed */
-    Time configTimestamp B32;       /* time config data was changed */
-    Window root B32;            /* root window */
-    Window window B32;          /* window requesting notification */
-    SizeID sizeID B16;          /* new size ID */
-    CARD16 subpixelOrder B16;       /* subpixel order */
-    CARD16 widthInPixels B16;       /* new size */
+    Time timestamp B32;			/* time screen was changed */
+    Time configTimestamp B32;		/* time config data was changed */
+    Window root B32;			/* root window */
+    Window window B32;			/* window requesting notification */
+    SizeID sizeID B16;			/* new size ID */
+    CARD16 subpixelOrder B16;		/* subpixel order */
+    CARD16 widthInPixels B16;		/* new size */
     CARD16 heightInPixels B16;
     CARD16 widthInMillimeters B16;
     CARD16 heightInMillimeters B16;
 } xRRScreenChangeNotifyEvent;
-#define sz_xRRScreenChangeNotifyEvent   32
+#define sz_xRRScreenChangeNotifyEvent	32
 
 #undef Window
 #undef Drawable
diff --git a/x11_extensions/inc/render.h b/x11_extensions/inc/render.h
index aff7c47959d0..497af6d10415 100644
--- a/x11_extensions/inc/render.h
+++ b/x11_extensions/inc/render.h
@@ -26,159 +26,159 @@
 #ifndef _RENDER_H_
 #define _RENDER_H_
 
-typedef XID     Glyph;
-typedef XID     GlyphSet;
-typedef XID     Picture;
-typedef XID     PictFormat;
-
-#define RENDER_NAME "RENDER"
-#define RENDER_MAJOR    0
-#define RENDER_MINOR    10
-
-#define X_RenderQueryVersion            0
-#define X_RenderQueryPictFormats        1
-#define X_RenderQueryPictIndexValues        2   /* 0.7 */
-#define X_RenderQueryDithers            3
-#define X_RenderCreatePicture           4
-#define X_RenderChangePicture           5
+typedef XID		Glyph;
+typedef XID		GlyphSet;
+typedef XID		Picture;
+typedef XID		PictFormat;
+
+#define RENDER_NAME	"RENDER"
+#define RENDER_MAJOR	0
+#define RENDER_MINOR	10
+
+#define X_RenderQueryVersion		    0
+#define X_RenderQueryPictFormats	    1
+#define X_RenderQueryPictIndexValues	    2	/* 0.7 */
+#define X_RenderQueryDithers		    3
+#define X_RenderCreatePicture		    4
+#define X_RenderChangePicture		    5
 #define X_RenderSetPictureClipRectangles    6
-#define X_RenderFreePicture         7
-#define X_RenderComposite           8
-#define X_RenderScale               9
-#define X_RenderTrapezoids          10
-#define X_RenderTriangles           11
-#define X_RenderTriStrip            12
-#define X_RenderTriFan              13
-#define X_RenderColorTrapezoids         14
-#define X_RenderColorTriangles          15
-/* #define X_RenderTransform            16 */
-#define X_RenderCreateGlyphSet          17
-#define X_RenderReferenceGlyphSet       18
-#define X_RenderFreeGlyphSet            19
-#define X_RenderAddGlyphs           20
-#define X_RenderAddGlyphsFromPicture        21
-#define X_RenderFreeGlyphs          22
-#define X_RenderCompositeGlyphs8        23
-#define X_RenderCompositeGlyphs16       24
-#define X_RenderCompositeGlyphs32       25
-#define X_RenderFillRectangles          26
+#define X_RenderFreePicture		    7
+#define X_RenderComposite		    8
+#define X_RenderScale			    9
+#define X_RenderTrapezoids		    10
+#define X_RenderTriangles		    11
+#define X_RenderTriStrip		    12
+#define X_RenderTriFan			    13
+#define X_RenderColorTrapezoids		    14
+#define X_RenderColorTriangles		    15
+/* #define X_RenderTransform		    16 */
+#define X_RenderCreateGlyphSet		    17
+#define X_RenderReferenceGlyphSet	    18
+#define X_RenderFreeGlyphSet		    19
+#define X_RenderAddGlyphs		    20
+#define X_RenderAddGlyphsFromPicture	    21
+#define X_RenderFreeGlyphs		    22
+#define X_RenderCompositeGlyphs8	    23
+#define X_RenderCompositeGlyphs16	    24
+#define X_RenderCompositeGlyphs32	    25
+#define X_RenderFillRectangles		    26
 /* 0.5 */
-#define X_RenderCreateCursor            27
+#define X_RenderCreateCursor		    27
 /* 0.6 */
-#define X_RenderSetPictureTransform     28
-#define X_RenderQueryFilters            29
-#define X_RenderSetPictureFilter        30
+#define X_RenderSetPictureTransform	    28
+#define X_RenderQueryFilters		    29
+#define X_RenderSetPictureFilter	    30
 /* 0.8 */
-#define X_RenderCreateAnimCursor        31
+#define X_RenderCreateAnimCursor	    31
 /* 0.9 */
-#define X_RenderAddTraps            32
+#define X_RenderAddTraps		    32
 /* 0.10 */
 #define X_RenderCreateSolidFill             33
 #define X_RenderCreateLinearGradient        34
 #define X_RenderCreateRadialGradient        35
 #define X_RenderCreateConicalGradient       36
-#define RenderNumberRequests            (X_RenderCreateConicalGradient+1)
-
-#define BadPictFormat               0
-#define BadPicture              1
-#define BadPictOp               2
-#define BadGlyphSet             3
-#define BadGlyph                4
-#define RenderNumberErrors          (BadGlyph+1)
-
-#define PictTypeIndexed             0
-#define PictTypeDirect              1
-
-#define PictOpMinimum               0
-#define PictOpClear             0
-#define PictOpSrc               1
-#define PictOpDst               2
-#define PictOpOver              3
-#define PictOpOverReverse           4
-#define PictOpIn                5
-#define PictOpInReverse             6
-#define PictOpOut               7
-#define PictOpOutReverse            8
-#define PictOpAtop              9
-#define PictOpAtopReverse           10
-#define PictOpXor               11
-#define PictOpAdd               12
-#define PictOpSaturate              13
-#define PictOpMaximum               13
+#define RenderNumberRequests		    (X_RenderCreateConicalGradient+1)
+
+#define BadPictFormat			    0
+#define BadPicture			    1
+#define BadPictOp			    2
+#define BadGlyphSet			    3
+#define BadGlyph			    4
+#define RenderNumberErrors		    (BadGlyph+1)
+
+#define PictTypeIndexed			    0
+#define PictTypeDirect			    1
+
+#define PictOpMinimum			    0
+#define PictOpClear			    0
+#define PictOpSrc			    1
+#define PictOpDst			    2
+#define PictOpOver			    3
+#define PictOpOverReverse		    4
+#define PictOpIn			    5
+#define PictOpInReverse			    6
+#define PictOpOut			    7
+#define PictOpOutReverse		    8
+#define PictOpAtop			    9
+#define PictOpAtopReverse		    10
+#define PictOpXor			    11
+#define PictOpAdd			    12
+#define PictOpSaturate			    13
+#define PictOpMaximum			    13
 
 /*
  * Operators only available in version 0.2
  */
-#define PictOpDisjointMinimum               0x10
-#define PictOpDisjointClear             0x10
-#define PictOpDisjointSrc               0x11
-#define PictOpDisjointDst               0x12
-#define PictOpDisjointOver              0x13
-#define PictOpDisjointOverReverse           0x14
-#define PictOpDisjointIn                0x15
-#define PictOpDisjointInReverse             0x16
-#define PictOpDisjointOut               0x17
-#define PictOpDisjointOutReverse            0x18
-#define PictOpDisjointAtop              0x19
-#define PictOpDisjointAtopReverse           0x1a
-#define PictOpDisjointXor               0x1b
-#define PictOpDisjointMaximum               0x1b
-
-#define PictOpConjointMinimum               0x20
-#define PictOpConjointClear             0x20
-#define PictOpConjointSrc               0x21
-#define PictOpConjointDst               0x22
-#define PictOpConjointOver              0x23
-#define PictOpConjointOverReverse           0x24
-#define PictOpConjointIn                0x25
-#define PictOpConjointInReverse             0x26
-#define PictOpConjointOut               0x27
-#define PictOpConjointOutReverse            0x28
-#define PictOpConjointAtop              0x29
-#define PictOpConjointAtopReverse           0x2a
-#define PictOpConjointXor               0x2b
-#define PictOpConjointMaximum               0x2b
-
-#define PolyEdgeSharp               0
-#define PolyEdgeSmooth              1
-
-#define PolyModePrecise             0
-#define PolyModeImprecise           1
-
-#define CPRepeat                (1 << 0)
-#define CPAlphaMap              (1 << 1)
-#define CPAlphaXOrigin              (1 << 2)
-#define CPAlphaYOrigin              (1 << 3)
-#define CPClipXOrigin               (1 << 4)
-#define CPClipYOrigin               (1 << 5)
-#define CPClipMask              (1 << 6)
-#define CPGraphicsExposure          (1 << 7)
-#define CPSubwindowMode             (1 << 8)
-#define CPPolyEdge              (1 << 9)
-#define CPPolyMode              (1 << 10)
-#define CPDither                (1 << 11)
-#define CPComponentAlpha            (1 << 12)
-#define CPLastBit               12
+#define PictOpDisjointMinimum			    0x10
+#define PictOpDisjointClear			    0x10
+#define PictOpDisjointSrc			    0x11
+#define PictOpDisjointDst			    0x12
+#define PictOpDisjointOver			    0x13
+#define PictOpDisjointOverReverse		    0x14
+#define PictOpDisjointIn			    0x15
+#define PictOpDisjointInReverse			    0x16
+#define PictOpDisjointOut			    0x17
+#define PictOpDisjointOutReverse		    0x18
+#define PictOpDisjointAtop			    0x19
+#define PictOpDisjointAtopReverse		    0x1a
+#define PictOpDisjointXor			    0x1b
+#define PictOpDisjointMaximum			    0x1b
+
+#define PictOpConjointMinimum			    0x20
+#define PictOpConjointClear			    0x20
+#define PictOpConjointSrc			    0x21
+#define PictOpConjointDst			    0x22
+#define PictOpConjointOver			    0x23
+#define PictOpConjointOverReverse		    0x24
+#define PictOpConjointIn			    0x25
+#define PictOpConjointInReverse			    0x26
+#define PictOpConjointOut			    0x27
+#define PictOpConjointOutReverse		    0x28
+#define PictOpConjointAtop			    0x29
+#define PictOpConjointAtopReverse		    0x2a
+#define PictOpConjointXor			    0x2b
+#define PictOpConjointMaximum			    0x2b
+
+#define PolyEdgeSharp			    0
+#define PolyEdgeSmooth			    1
+
+#define PolyModePrecise			    0
+#define PolyModeImprecise		    1
+
+#define CPRepeat			    (1 << 0)
+#define CPAlphaMap			    (1 << 1)
+#define CPAlphaXOrigin			    (1 << 2)
+#define CPAlphaYOrigin			    (1 << 3)
+#define CPClipXOrigin			    (1 << 4)
+#define CPClipYOrigin			    (1 << 5)
+#define CPClipMask			    (1 << 6)
+#define CPGraphicsExposure		    (1 << 7)
+#define CPSubwindowMode			    (1 << 8)
+#define CPPolyEdge			    (1 << 9)
+#define CPPolyMode			    (1 << 10)
+#define CPDither			    (1 << 11)
+#define CPComponentAlpha		    (1 << 12)
+#define CPLastBit			    12
 
 /* Filters included in 0.6 */
-#define FilterNearest               "nearest"
-#define FilterBilinear              "bilinear"
+#define FilterNearest			    "nearest"
+#define FilterBilinear			    "bilinear"
 /* Filters included in 0.10 */
-#define FilterConvolution           "convolution"
+#define FilterConvolution		    "convolution"
 
-#define FilterFast              "fast"
-#define FilterGood              "good"
-#define FilterBest              "best"
+#define FilterFast			    "fast"
+#define FilterGood			    "good"
+#define FilterBest			    "best"
 
-#define FilterAliasNone             -1
+#define FilterAliasNone			    -1
 
 /* Subpixel orders included in 0.6 */
-#define SubPixelUnknown             0
-#define SubPixelHorizontalRGB           1
-#define SubPixelHorizontalBGR           2
-#define SubPixelVerticalRGB         3
-#define SubPixelVerticalBGR         4
-#define SubPixelNone                5
+#define SubPixelUnknown			    0
+#define SubPixelHorizontalRGB		    1
+#define SubPixelHorizontalBGR		    2
+#define SubPixelVerticalRGB		    3
+#define SubPixelVerticalBGR		    4
+#define SubPixelNone			    5
 
 /* Extended repeat attributes included in 0.10 */
 #define RepeatNone                          0
@@ -186,4 +186,4 @@ typedef XID     PictFormat;
 #define RepeatPad                           2
 #define RepeatReflect                       3
 
-#endif  /* _RENDER_H_ */
+#endif	/* _RENDER_H_ */
diff --git a/x11_extensions/inc/renderproto.h b/x11_extensions/inc/renderproto.h
index 2b2c708d982f..ffe06395d081 100644
--- a/x11_extensions/inc/renderproto.h
+++ b/x11_extensions/inc/renderproto.h
@@ -42,9 +42,9 @@
 #define KeyCode CARD8
 #define KeySym CARD32
 
-#define Picture     CARD32
+#define Picture	    CARD32
 #define PictFormat  CARD32
-#define Fixed       INT32
+#define Fixed	    INT32
 #define Glyphset    CARD32
 
 /*
@@ -65,86 +65,86 @@ typedef struct {
 #define sz_xDirectFormat    16
 
 typedef struct {
-    PictFormat  id B32;
-    CARD8   type;
-    CARD8   depth;
-    CARD16  pad1 B16;
+    PictFormat	id B32;
+    CARD8	type;
+    CARD8	depth;
+    CARD16	pad1 B16;
     xDirectFormat   direct;
-    Colormap    colormap;
+    Colormap	colormap;
 } xPictFormInfo;
 
 #define sz_xPictFormInfo    28
 
 typedef struct {
-    VisualID    visual;
-    PictFormat  format;
+    VisualID	visual;
+    PictFormat	format;
 } xPictVisual;
 
-#define sz_xPictVisual      8
+#define sz_xPictVisual	    8
 
 typedef struct {
-    CARD8   depth;
-    CARD8   pad1;
-    CARD16  nPictVisuals B16;
-    CARD32  pad2 B32;
+    CARD8	depth;
+    CARD8	pad1;
+    CARD16	nPictVisuals B16;
+    CARD32	pad2 B32;
 } xPictDepth;
 
-#define sz_xPictDepth   8
+#define sz_xPictDepth	8
 
 typedef struct {
-    CARD32  nDepth B32;
-    PictFormat  fallback B32;
+    CARD32	nDepth B32;
+    PictFormat	fallback B32;
 } xPictScreen;
 
-#define sz_xPictScreen  8
+#define sz_xPictScreen	8
 
 typedef struct {
-    CARD32  pixel B32;
-    CARD16  red B16;
-    CARD16  green B16;
-    CARD16  blue B16;
-    CARD16  alpha B16;
+    CARD32	pixel B32;
+    CARD16	red B16;
+    CARD16	green B16;
+    CARD16	blue B16;
+    CARD16	alpha B16;
 } xIndexValue;
 
-#define sz_xIndexValue  12
+#define sz_xIndexValue	12
 
 typedef struct {
-    CARD16  red B16;
-    CARD16  green B16;
-    CARD16  blue B16;
-    CARD16  alpha B16;
+    CARD16	red B16;
+    CARD16	green B16;
+    CARD16	blue B16;
+    CARD16	alpha B16;
 } xRenderColor;
 
-#define sz_xRenderColor 8
+#define sz_xRenderColor	8
 
 typedef struct {
-    Fixed   x B32;
-    Fixed   y B32;
+    Fixed	x B32;
+    Fixed	y B32;
 } xPointFixed;
 
-#define sz_xPointFixed  8
+#define sz_xPointFixed	8
 
 typedef struct {
-    xPointFixed p1;
+    xPointFixed	p1;
     xPointFixed p2;
 } xLineFixed;
 
-#define sz_xLineFixed   16
+#define sz_xLineFixed	16
 
 typedef struct {
-    xPointFixed p1, p2, p3;
+    xPointFixed	p1, p2, p3;
 } xTriangle;
 
-#define sz_xTriangle    24
+#define sz_xTriangle	24
 
 typedef struct {
-    Fixed   top B32;
-    Fixed   bottom B32;
-    xLineFixed  left;
-    xLineFixed  right;
+    Fixed	top B32;
+    Fixed	bottom B32;
+    xLineFixed	left;
+    xLineFixed	right;
 } xTrapezoid;
 
-#define sz_xTrapezoid   40
+#define sz_xTrapezoid	40
 
 typedef struct {
     CARD16  width B16;
@@ -155,7 +155,7 @@ typedef struct {
     INT16   yOff B16;
 } xGlyphInfo;
 
-#define sz_xGlyphInfo   12
+#define sz_xGlyphInfo	12
 
 typedef struct {
     CARD8   len;
@@ -165,19 +165,19 @@ typedef struct {
     INT16   deltay;
 } xGlyphElt;
 
-#define sz_xGlyphElt    8
+#define sz_xGlyphElt	8
 
 typedef struct {
     Fixed   l, r, y;
 } xSpanFix;
 
-#define sz_xSpanFix 12
+#define sz_xSpanFix	12
 
 typedef struct {
-    xSpanFix    top, bot;
+    xSpanFix	top, bot;
 } xTrap;
 
-#define sz_xTrap    24
+#define sz_xTrap	24
 
 /*
  * requests and replies
@@ -205,7 +205,7 @@ typedef struct {
     CARD32  pad5 B32;
 } xRenderQueryVersionReply;
 
-#define sz_xRenderQueryVersionReply 32
+#define sz_xRenderQueryVersionReply	32
 
 typedef struct {
     CARD8   reqType;
@@ -213,7 +213,7 @@ typedef struct {
     CARD16  length B16;
 } xRenderQueryPictFormatsReq;
 
-#define sz_xRenderQueryPictFormatsReq   4
+#define sz_xRenderQueryPictFormatsReq	4
 
 typedef struct {
     BYTE    type;   /* X_Reply */
@@ -224,17 +224,17 @@ typedef struct {
     CARD32  numScreens B32;
     CARD32  numDepths B32;
     CARD32  numVisuals B32;
-    CARD32  numSubpixel B32;        /* Version 0.6 */
+    CARD32  numSubpixel B32;	    /* Version 0.6 */
     CARD32  pad5 B32;
 } xRenderQueryPictFormatsReply;
 
-#define sz_xRenderQueryPictFormatsReply 32
+#define sz_xRenderQueryPictFormatsReply	32
 
 typedef struct {
     CARD8   reqType;
     CARD8   renderReqType;
     CARD16  length B16;
-    PictFormat  format B32;
+    PictFormat	format B32;
 } xRenderQueryPictIndexValuesReq;
 
 #define sz_xRenderQueryPictIndexValuesReq   8
@@ -255,37 +255,37 @@ typedef struct {
 #define sz_xRenderQueryPictIndexValuesReply 32
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture pid B32;
-    Drawable    drawable B32;
-    PictFormat  format B32;
-    CARD32  mask B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	pid B32;
+    Drawable	drawable B32;
+    PictFormat	format B32;
+    CARD32	mask B32;
 } xRenderCreatePictureReq;
 
-#define sz_xRenderCreatePictureReq      20
+#define sz_xRenderCreatePictureReq	    20
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture picture B32;
-    CARD32  mask B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	picture B32;
+    CARD32	mask B32;
 } xRenderChangePictureReq;
 
-#define sz_xRenderChangePictureReq      12
+#define sz_xRenderChangePictureReq	    12
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
     Picture     picture B32;
-    INT16   xOrigin B16;
-    INT16   yOrigin B16;
+    INT16	xOrigin B16;
+    INT16	yOrigin B16;
 } xRenderSetPictureClipRectanglesReq;
 
-#define sz_xRenderSetPictureClipRectanglesReq       12
+#define sz_xRenderSetPictureClipRectanglesReq	    12
 
 typedef struct {
     CARD8       reqType;
@@ -294,121 +294,121 @@ typedef struct {
     Picture     picture B32;
 } xRenderFreePictureReq;
 
-#define sz_xRenderFreePictureReq        8
+#define sz_xRenderFreePictureReq	    8
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture mask B32;
-    Picture dst B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
-    INT16   xMask B16;
-    INT16   yMask B16;
-    INT16   xDst B16;
-    INT16   yDst B16;
-    CARD16  width B16;
-    CARD16  height B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	mask B32;
+    Picture	dst B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
+    INT16	xMask B16;
+    INT16	yMask B16;
+    INT16	xDst B16;
+    INT16	yDst B16;
+    CARD16	width B16;
+    CARD16	height B16;
 } xRenderCompositeReq;
 
-#define sz_xRenderCompositeReq          36
+#define sz_xRenderCompositeReq		    36
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    Picture src B32;
-    Picture dst B32;
-    CARD32  colorScale B32;
-    CARD32  alphaScale B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
-    INT16   xDst B16;
-    INT16   yDst B16;
-    CARD16  width B16;
-    CARD16  height B16;
+    Picture	src B32;
+    Picture	dst B32;
+    CARD32	colorScale B32;
+    CARD32	alphaScale B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
+    INT16	xDst B16;
+    INT16	yDst B16;
+    CARD16	width B16;
+    CARD16	height B16;
 } xRenderScaleReq;
 
-#define sz_xRenderScaleReq              32
+#define sz_xRenderScaleReq			    32
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture dst B32;
-    PictFormat  maskFormat B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
 } xRenderTrapezoidsReq;
 
-#define sz_xRenderTrapezoidsReq             24
+#define sz_xRenderTrapezoidsReq			    24
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture dst B32;
-    PictFormat  maskFormat B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
 } xRenderTrianglesReq;
 
-#define sz_xRenderTrianglesReq              24
+#define sz_xRenderTrianglesReq			    24
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture dst B32;
-    PictFormat  maskFormat B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
 } xRenderTriStripReq;
 
-#define sz_xRenderTriStripReq               24
+#define sz_xRenderTriStripReq			    24
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture dst B32;
-    PictFormat  maskFormat B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
 } xRenderTriFanReq;
 
-#define sz_xRenderTriFanReq             24
+#define sz_xRenderTriFanReq			    24
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    Glyphset    gsid B32;
-    PictFormat  format B32;
+    Glyphset	gsid B32;
+    PictFormat	format B32;
 } xRenderCreateGlyphSetReq;
 
-#define sz_xRenderCreateGlyphSetReq         12
+#define sz_xRenderCreateGlyphSetReq		    12
 
 typedef struct {
     CARD8       reqType;
@@ -418,7 +418,7 @@ typedef struct {
     Glyphset    existing B32;
 } xRenderReferenceGlyphSetReq;
 
-#define sz_xRenderReferenceGlyphSetReq          24
+#define sz_xRenderReferenceGlyphSetReq		    24
 
 typedef struct {
     CARD8       reqType;
@@ -427,17 +427,17 @@ typedef struct {
     Glyphset    glyphset B32;
 } xRenderFreeGlyphSetReq;
 
-#define sz_xRenderFreeGlyphSetReq           8
+#define sz_xRenderFreeGlyphSetReq		    8
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
     Glyphset    glyphset B32;
-    CARD32  nglyphs;
+    CARD32	nglyphs;
 } xRenderAddGlyphsReq;
 
-#define sz_xRenderAddGlyphsReq              12
+#define sz_xRenderAddGlyphsReq			    12
 
 typedef struct {
     CARD8       reqType;
@@ -446,56 +446,56 @@ typedef struct {
     Glyphset    glyphset B32;
 } xRenderFreeGlyphsReq;
 
-#define sz_xRenderFreeGlyphsReq             8
+#define sz_xRenderFreeGlyphsReq			    8
 
 typedef struct {
     CARD8       reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture src B32;
-    Picture dst B32;
-    PictFormat  maskFormat B32;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	src B32;
+    Picture	dst B32;
+    PictFormat	maskFormat B32;
     Glyphset    glyphset B32;
-    INT16   xSrc B16;
-    INT16   ySrc B16;
+    INT16	xSrc B16;
+    INT16	ySrc B16;
 } xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
 xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
 
-#define sz_xRenderCompositeGlyphs8Req           28
-#define sz_xRenderCompositeGlyphs16Req          28
-#define sz_xRenderCompositeGlyphs32Req          28
+#define sz_xRenderCompositeGlyphs8Req		    28
+#define sz_xRenderCompositeGlyphs16Req		    28
+#define sz_xRenderCompositeGlyphs32Req		    28
 
 /* 0.1 and higher */
 
 typedef struct {
-    CARD8   reqType;
+    CARD8	reqType;
     CARD8       renderReqType;
     CARD16      length B16;
-    CARD8   op;
-    CARD8   pad1;
-    CARD16  pad2 B16;
-    Picture dst B32;
+    CARD8	op;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    Picture	dst B32;
     xRenderColor    color;
 } xRenderFillRectanglesReq;
 
-#define sz_xRenderFillRectanglesReq         20
+#define sz_xRenderFillRectanglesReq		    20
 
 /* 0.5 and higher */
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Cursor  cid B32;
-    Picture src B32;
-    CARD16  x B16;
-    CARD16  y B16;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Cursor	cid B32;
+    Picture	src B32;
+    CARD16	x B16;
+    CARD16	y B16;
 } xRenderCreateCursorReq;
 
-#define sz_xRenderCreateCursorReq           16
+#define sz_xRenderCreateCursorReq		    16
 
 /* 0.6 and higher */
 
@@ -503,112 +503,112 @@ typedef struct {
  * This can't use an array because 32-bit values may be in bitfields
  */
 typedef struct {
-    Fixed   matrix11 B32;
-    Fixed   matrix12 B32;
-    Fixed   matrix13 B32;
-    Fixed   matrix21 B32;
-    Fixed   matrix22 B32;
-    Fixed   matrix23 B32;
-    Fixed   matrix31 B32;
-    Fixed   matrix32 B32;
-    Fixed   matrix33 B32;
+    Fixed	matrix11 B32;
+    Fixed	matrix12 B32;
+    Fixed	matrix13 B32;
+    Fixed	matrix21 B32;
+    Fixed	matrix22 B32;
+    Fixed	matrix23 B32;
+    Fixed	matrix31 B32;
+    Fixed	matrix32 B32;
+    Fixed	matrix33 B32;
 } xRenderTransform;
 
 #define sz_xRenderTransform 36
 
 typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture     picture B32;
-    xRenderTransform    transform;
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture B32;
+    xRenderTransform	transform;
 } xRenderSetPictureTransformReq;
 
-#define sz_xRenderSetPictureTransformReq        44
+#define sz_xRenderSetPictureTransformReq	    44
 
 typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Drawable        drawable B32;
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Drawable		drawable B32;
 } xRenderQueryFiltersReq;
 
-#define sz_xRenderQueryFiltersReq           8
+#define sz_xRenderQueryFiltersReq		    8
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    CARD32  numAliases B32; /* LISTofCARD16 */
-    CARD32  numFilters B32; /* LISTofSTRING8 */
+    CARD32  numAliases B32;	/* LISTofCARD16 */
+    CARD32  numFilters B32;	/* LISTofSTRING8 */
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
     CARD32  pad5 B32;
 } xRenderQueryFiltersReply;
 
-#define sz_xRenderQueryFiltersReply         32
+#define sz_xRenderQueryFiltersReply		    32
 
 typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture     picture B32;
-    CARD16      nbytes B16; /* number of bytes in name */
-    CARD16      pad B16;
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture B32;
+    CARD16		nbytes B16; /* number of bytes in name */
+    CARD16		pad B16;
 } xRenderSetPictureFilterReq;
 
-#define sz_xRenderSetPictureFilterReq           12
+#define sz_xRenderSetPictureFilterReq		    12
 
 /* 0.8 and higher */
 
 typedef struct {
-    Cursor      cursor B32;
-    CARD32      delay B32;
+    Cursor		cursor B32;
+    CARD32		delay B32;
 } xAnimCursorElt;
 
-#define sz_xAnimCursorElt               8
+#define sz_xAnimCursorElt			    8
 
 typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Cursor      cid B32;
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Cursor		cid B32;
 } xRenderCreateAnimCursorReq;
 
-#define sz_xRenderCreateAnimCursorReq           8
+#define sz_xRenderCreateAnimCursorReq		    8
 
 /* 0.9 and higher */
 
 typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture     picture;
-    INT16       xOff B16;
-    INT16       yOff B16;
+    CARD8		reqType;
+    CARD8		renderReqType;
+    CARD16		length B16;
+    Picture		picture;
+    INT16		xOff B16;
+    INT16		yOff B16;
 } xRenderAddTrapsReq;
 
-#define sz_xRenderAddTrapsReq               12
+#define sz_xRenderAddTrapsReq			    12
 
 /* 0.10 and higher */
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture pid B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	pid B32;
     xRenderColor color;
 } xRenderCreateSolidFillReq;
 
 #define sz_xRenderCreateSolidFillReq                 16
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture pid B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	pid B32;
     xPointFixed p1;
     xPointFixed p2;
     CARD32      nStops;
@@ -617,10 +617,10 @@ typedef struct {
 #define sz_xRenderCreateLinearGradientReq                 28
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture pid B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	pid B32;
     xPointFixed inner;
     xPointFixed outer;
     Fixed       inner_radius;
@@ -631,10 +631,10 @@ typedef struct {
 #define sz_xRenderCreateRadialGradientReq                 36
 
 typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    Picture pid B32;
+    CARD8	reqType;
+    CARD8	renderReqType;
+    CARD16	length B16;
+    Picture	pid B32;
     xPointFixed center;
     Fixed       angle; /* in degrees */
     CARD32      nStops;
diff --git a/x11_extensions/inc/shape.h b/x11_extensions/inc/shape.h
index 839ec49a2c75..7992f7a5a188 100644
--- a/x11_extensions/inc/shape.h
+++ b/x11_extensions/inc/shape.h
@@ -37,115 +37,115 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xutil.h>
 
 typedef struct {
-    int type;           /* of event */
+    int	type;		    /* of event */
     unsigned long serial;   /* # of last request processed by server */
-    Bool send_event;        /* true if this came frome a SendEvent request */
-    Display *display;       /* Display the event was read from */
-    Window window;      /* window of event */
-    int kind;           /* ShapeBounding or ShapeClip */
-    int x, y;           /* extents of new region */
+    Bool send_event;	    /* true if this came frome a SendEvent request */
+    Display *display;	    /* Display the event was read from */
+    Window window;	    /* window of event */
+    int kind;		    /* ShapeBounding or ShapeClip */
+    int x, y;		    /* extents of new region */
     unsigned width, height;
-    Time time;          /* server timestamp when region changed */
-    Bool shaped;        /* true if the region exists */
+    Time time;		    /* server timestamp when region changed */
+    Bool shaped;	    /* true if the region exists */
 } XShapeEvent;
 
 _XFUNCPROTOBEGIN
 
 extern Bool XShapeQueryExtension (
-    Display*    /* display */,
-    int*    /* event_base */,
-    int*    /* error_base */
+    Display*	/* display */,
+    int*	/* event_base */,
+    int*	/* error_base */
 );
 
 extern Status XShapeQueryVersion (
-    Display*    /* display */,
-    int*    /* major_version */,
-    int*    /* minor_version */
+    Display*	/* display */,
+    int*	/* major_version */,
+    int*	/* minor_version */
 );
 
 extern void XShapeCombineRegion (
-    Display*    /* display */,
-    Window  /* dest */,
-    int     /* dest_kind */,
-    int     /* x_off */,
-    int     /* y_off */,
-    Region  /* region */,
-    int     /* op */
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Region	/* region */,
+    int		/* op */
 );
 
 extern void XShapeCombineRectangles (
-    Display*    /* display */,
-    Window  /* dest */,
-    int     /* dest_kind */,
-    int     /* x_off */,
-    int     /* y_off */,
-    XRectangle* /* rectangles */,
-    int     /* n_rects */,
-    int     /* op */,
-    int     /* ordering */
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    XRectangle*	/* rectangles */,
+    int		/* n_rects */,
+    int		/* op */,
+    int		/* ordering */
 );
 
 extern void XShapeCombineMask (
-    Display*    /* display */,
-    Window  /* dest */,
-    int     /* dest_kind */,
-    int     /* x_off */,
-    int     /* y_off */,
-    Pixmap  /* src */,
-    int     /* op */
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Pixmap	/* src */,
+    int		/* op */
 );
 
 extern void XShapeCombineShape (
-    Display*    /* display */,
-    Window  /* dest */,
-    int     /* dest_kind */,
-    int     /* x_off */,
-    int     /* y_off */,
-    Window  /* src */,
-    int     /* src_kind */,
-    int     /* op */
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Window	/* src */,
+    int		/* src_kind */,
+    int		/* op */
 );
 
 extern void XShapeOffsetShape (
-    Display*    /* display */,
-    Window  /* dest */,
-    int     /* dest_kind */,
-    int     /* x_off */,
-    int     /* y_off */
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */
 );
 
 extern Status XShapeQueryExtents (
-    Display*        /* display */,
-    Window      /* window */,
-    Bool*       /* bounding_shaped */,
-    int*        /* x_bounding */,
-    int*        /* y_bounding */,
-    unsigned int*   /* w_bounding */,
-    unsigned int*   /* h_bounding */,
-    Bool*       /* clip_shaped */,
-    int*        /* x_clip */,
-    int*        /* y_clip */,
-    unsigned int*   /* w_clip */,
-    unsigned int*   /* h_clip */
+    Display*		/* display */,
+    Window		/* window */,
+    Bool*		/* bounding_shaped */,
+    int*		/* x_bounding */,
+    int*		/* y_bounding */,
+    unsigned int*	/* w_bounding */,
+    unsigned int*	/* h_bounding */,
+    Bool*		/* clip_shaped */,
+    int*		/* x_clip */,
+    int*		/* y_clip */,
+    unsigned int*	/* w_clip */,
+    unsigned int*	/* h_clip */
 );
 
 extern void XShapeSelectInput (
-    Display*        /* display */,
-    Window      /* window */,
-    unsigned long   /* mask */
+    Display*		/* display */,
+    Window		/* window */,
+    unsigned long	/* mask */
 );
 
 extern unsigned long XShapeInputSelected (
-    Display*    /* display */,
-    Window  /* window */
+    Display*	/* display */,
+    Window	/* window */
 );
 
 extern XRectangle *XShapeGetRectangles (
-    Display*    /* display */,
-    Window  /* window */,
-    int     /* kind */,
-    int*    /* count */,
-    int*    /* ordering */
+    Display*	/* display */,
+    Window	/* window */,
+    int		/* kind */,
+    int*	/* count */,
+    int*	/* ordering */
 );
 
 _XFUNCPROTOEND
diff --git a/x11_extensions/inc/shapeconst.h b/x11_extensions/inc/shapeconst.h
index 9ef01f3d8ebe..9088956f1b90 100644
--- a/x11_extensions/inc/shapeconst.h
+++ b/x11_extensions/inc/shapeconst.h
@@ -34,22 +34,22 @@ in this Software without prior written authorization from The Open Group.
 
 #define SHAPENAME "SHAPE"
 
-#define SHAPE_MAJOR_VERSION 1   /* current version numbers */
-#define SHAPE_MINOR_VERSION 1
+#define SHAPE_MAJOR_VERSION	1	/* current version numbers */
+#define SHAPE_MINOR_VERSION	1
 
-#define ShapeSet            0
-#define ShapeUnion          1
-#define ShapeIntersect          2
-#define ShapeSubtract           3
-#define ShapeInvert         4
+#define ShapeSet			0
+#define ShapeUnion			1
+#define ShapeIntersect			2
+#define ShapeSubtract			3
+#define ShapeInvert			4
 
-#define ShapeBounding           0
-#define ShapeClip           1
-#define ShapeInput          2
+#define ShapeBounding			0
+#define ShapeClip			1
+#define ShapeInput			2
 
-#define ShapeNotifyMask         (1L << 0)
-#define ShapeNotify         0
+#define ShapeNotifyMask			(1L << 0)
+#define ShapeNotify			0
 
-#define ShapeNumberEvents       (ShapeNotify + 1)
+#define ShapeNumberEvents		(ShapeNotify + 1)
 
 #endif /* _SHAPECONST_H_ */