From 60268d1da99313bf0a44dcb41079f63ce575728f Mon Sep 17 00:00:00 2001
From: Ian Pilcher <ian.pilcher@home.com>
Date: Mon, 23 Apr 2001 18:12:45 +0000
Subject: [PATCH] Use typecasts to suppress compiler warnings.

---
 dlls/wineps/glyphlist.c | 17 +++++------------
 dlls/wineps/psdrv.h     |  8 ++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/dlls/wineps/glyphlist.c b/dlls/wineps/glyphlist.c
index e123d55c0f9..4d2d7682468 100644
--- a/dlls/wineps/glyphlist.c
+++ b/dlls/wineps/glyphlist.c
@@ -65,18 +65,11 @@ INT PSDRV_GlyphListInit()
  *  be initialized without generating compiler warnings
  *
  */
-typedef struct
+inline static INT GlyphListInsert(LPCSTR szName, INT index)
 {
-    INT	    index;
-    LPSTR   sz;
-} _glyphname;
+    GLYPHNAME *g;
 
-inline INT GlyphListInsert(LPCSTR szName, INT index)
-{
-    _glyphname	*g;
-
-    g = (_glyphname *)HeapAlloc(PSDRV_Heap, 0,
-	    sizeof(GLYPHNAME) + strlen(szName) + 1);
+    g = HeapAlloc(PSDRV_Heap, 0, sizeof(GLYPHNAME) + strlen(szName) + 1);
     if (g == NULL)
     {
 	ERR("Failed to allocate %i bytes of memory\n", 
@@ -86,7 +79,7 @@ inline INT GlyphListInsert(LPCSTR szName, INT index)
 
     g->index = -1;
     g->sz = (LPSTR)(g + 1);
-    strcpy(g->sz, szName);
+    strcpy((LPSTR)g->sz, szName);
 
     if (glyphListSize % GLYPHLIST_ALLOCSIZE == 0)	/* grow the list? */
     {
@@ -114,7 +107,7 @@ inline INT GlyphListInsert(LPCSTR szName, INT index)
 		(glyphListSize - index) * sizeof(GLYPHNAME *));
     }
 
-    glyphList[index] = (GLYPHNAME *)g;
+    glyphList[index] = g;
     ++glyphListSize;
 
     TRACE("Added '%s' at glyphList[%i] (glyphListSize now %i)\n",
diff --git a/dlls/wineps/psdrv.h b/dlls/wineps/psdrv.h
index 6ee72332a75..a15b498611e 100644
--- a/dlls/wineps/psdrv.h
+++ b/dlls/wineps/psdrv.h
@@ -15,18 +15,18 @@
 #include "winspool.h"
 
 typedef struct {
-    INT			index;
-    const LPCSTR	sz;
+    INT		index;
+    LPCSTR	sz;
 } GLYPHNAME;
 
 typedef struct {
     LONG		UV;
-    const GLYPHNAME	*const name;
+    const GLYPHNAME    *name;
 } UNICODEGLYPH;
 
 typedef struct {
     INT			size;
-    const UNICODEGLYPH	*const glyphs;
+    const UNICODEGLYPH *glyphs;
 } UNICODEVECTOR;
 
 extern const INT	    PSDRV_AGLGlyphNamesSize;