1 files changed, 11 insertions, 12 deletions

diff --git a/src/Glyph.c b/src/Glyph.c
index 4d5d4d4..d221ea5 100644
--- a/src/Glyph.c
+++ b/src/Glyph.c
@@ -1,5 +1,4 @@
 /*
- * $XFree86: xc/lib/Xrender/Glyph.c,v 1.11 2002/10/18 01:13:39 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -28,7 +27,7 @@
 GlyphSet
 XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     GlyphSet			gsid;
     xRenderCreateGlyphSetReq	*req;
 
@@ -47,7 +46,7 @@ XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format)
 GlyphSet
 XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing)
 {
-    XExtDisplayInfo             *info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo             *info = XRenderFindDisplay (dpy);
     GlyphSet                    gsid;
     xRenderReferenceGlyphSetReq	*req;
 
@@ -66,7 +65,7 @@ XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing)
 void
 XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset)
 {
-    XExtDisplayInfo         *info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo         *info = XRenderFindDisplay (dpy);
     xRenderFreeGlyphSetReq  *req;
 
     RenderSimpleCheckExtension (dpy, info);
@@ -88,7 +87,7 @@ XRenderAddGlyphs (Display	*dpy,
 		  _Xconst char		*images,
 		  int		nbyte_images)
 {
-    XExtDisplayInfo         *info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo         *info = XRenderFindDisplay (dpy);
     xRenderAddGlyphsReq	    *req;
     long		    len;
 
@@ -116,7 +115,7 @@ XRenderFreeGlyphs (Display   *dpy,
 		   _Xconst Glyph     *gids,
 		   int       nglyphs)
 {
-    XExtDisplayInfo         *info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo         *info = XRenderFindDisplay (dpy);
     xRenderFreeGlyphsReq    *req;
     long                    len;
 
@@ -148,7 +147,7 @@ XRenderCompositeString8 (Display	    *dpy,
 			 _Xconst char	    *string,
 			 int		    nchar)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs8Req	*req;
     long			len;
     xGlyphElt			*elt;
@@ -233,7 +232,7 @@ XRenderCompositeString16 (Display	    *dpy,
 			  _Xconst unsigned short    *string,
 			  int		    nchar)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs8Req	*req;
     long			len;
     xGlyphElt			*elt;
@@ -313,7 +312,7 @@ XRenderCompositeString32 (Display	    *dpy,
 			  _Xconst unsigned int	    *string,
 			  int		    nchar)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs8Req	*req;
     long			len;
     xGlyphElt			*elt;
@@ -392,7 +391,7 @@ XRenderCompositeText8 (Display			    *dpy,
 		       _Xconst XGlyphElt8	    *elts,
 		       int			    nelt)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs8Req	*req;
     GlyphSet			glyphset;
     long			len;
@@ -505,7 +504,7 @@ XRenderCompositeText16 (Display			    *dpy,
 			_Xconst XGlyphElt16	    *elts,
 			int			    nelt)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs16Req	*req;
     GlyphSet			glyphset;
     long			len;
@@ -616,7 +615,7 @@ XRenderCompositeText32 (Display			    *dpy,
 			_Xconst XGlyphElt32	    *elts,
 			int			    nelt)
 {
-    XExtDisplayInfo		*info = XRenderFindDisplay (dpy);
+    XRenderExtDisplayInfo		*info = XRenderFindDisplay (dpy);
     xRenderCompositeGlyphs32Req	*req;
     GlyphSet			glyphset;
     long			len;