diff --git a/ChangeLog b/ChangeLog
index 7276e5a..f2ea0f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-11 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/xlib/GSXftFontInfo.m (Ones): Correct the parameter name.
+	* Source/winlib/WIN32FontInfo.m (-glyphIsEncoded:): Add parameter
+	to windows call to supress defaults glyphs for missing ones.
+
 2008-04-08 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/gsc/GSGState.m (-_paintPath:, -_doComplexPath:...):
diff --git a/Source/winlib/WIN32FontInfo.m b/Source/winlib/WIN32FontInfo.m
index e947af2..5464313 100644
--- a/Source/winlib/WIN32FontInfo.m
+++ b/Source/winlib/WIN32FontInfo.m
@@ -167,7 +167,8 @@ NSLog(@"No glyph for U%d", c);
   hdc = CreateCompatibleDC(NULL);
   old = SelectObject(hdc, hFont);
   // Convert from GNUstep glyph (unichar) to windows glyph.
-  if ((GetGlyphIndicesW(hdc, &c, 1, &windowsGlyph, 0) == GDI_ERROR)
+  if ((GetGlyphIndicesW(hdc, &c, 1, &windowsGlyph, 
+                        GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR)
       || (windowsGlyph == 0xFFFF))
     {
       result = NO;
diff --git a/Source/xlib/GSXftFontInfo.m b/Source/xlib/GSXftFontInfo.m
index d5829fe..2e3a1d0 100644
--- a/Source/xlib/GSXftFontInfo.m
+++ b/Source/xlib/GSXftFontInfo.m
@@ -301,7 +301,7 @@ static NSArray *faFromFc(FcPattern *pat)
 #else
 /* Otherwise fall back on HACKMEM 169.  */
 static int
-Ones(unsigned int mask)
+Ones(unsigned int n)
 {
   register unsigned int tmp;