NXglyph.c: adapt FindGlyph() to better match render/glyph.c

nx-X11/programs/Xserver/hw/nxagent/NXglyph.c

@@ -161,18 +161,22 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
     CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom");
 }
 
-GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id)
+GlyphPtr
+FindGlyph (GlyphSetPtr glyphSet, Glyph id)
 {
-  GlyphRefPtr gr;
     GlyphPtr    glyph;
 
-  gr = FindGlyphRef (&glyphSet->hash, id, FALSE, 0);
+#ifdef NXAGENT_SERVER
+    GlyphRefPtr gr = FindGlyphRef (&glyphSet->hash, id, FALSE, 0);
     glyph = gr -> glyph;
-
+#else
+    glyph = FindGlyphRef (&glyphSet->hash, id, FALSE, 0)->glyph;
+#endif
     if (glyph == DeletedGlyph)
     {
         glyph = 0;
     }
+#ifdef NXAGENT_SERVER
     else if (gr -> corruptedGlyph == 1)
     {
         #ifdef DEBUG
@@ -183,6 +187,7 @@ GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id)
         nxagentAddGlyphs(glyphSet, &id, &(glyph -> info), 1,
                          (CARD8*)(glyph + 1), glyph -> size - sizeof(xGlyphInfo));
     }
+#endif
 
     return glyph;
 }