Eliminate __compar_fn_t in afm.c
Ian Pilcher
ian.pilcher at home.com
Fri May 11 10:27:21 CDT 2001
Modified files:
dlls/wineps: afm.c
Log message:
Ian Pilcher
WINEPS: eliminate __compar_fn_t in afm.c
--
========================================================================
Ian Pilcher ian.pilcher at home.com
========================================================================
-------------- next part --------------
diff -urN ../wine-20010511cvs/dlls/wineps/afm.c ./dlls/wineps/afm.c
--- ../wine-20010511cvs/dlls/wineps/afm.c Fri May 11 10:18:10 2001
+++ ./dlls/wineps/afm.c Fri May 11 10:24:05 2001
@@ -25,6 +25,9 @@
/* ptr to fonts for which we have afm files */
FONTFAMILY *PSDRV_AFMFontList = NULL;
+/* qsort/bsearch callback functions */
+typedef int (*compar_callback_fn) (const void *, const void *);
+
/*******************************************************************************
* CheckMetrics
*
@@ -683,7 +686,7 @@
qsort(aglCopy, PSDRV_AdobeGlyphList.size,
sizeof(UNICODEGLYPH),
- (__compar_fn_t)UnicodeGlyphByNameIndex);
+ (compar_callback_fn)UnicodeGlyphByNameIndex);
}
for (i = 0; i < afm->NumofMetrics; ++i)
@@ -695,7 +698,7 @@
pug = bsearch(&ug, aglCopy, PSDRV_AdobeGlyphList.size,
sizeof(UNICODEGLYPH),
- (__compar_fn_t)UnicodeGlyphByNameIndex);
+ (compar_callback_fn)UnicodeGlyphByNameIndex);
if (pug == NULL)
{
WARN("Glyph '%s' in font '%s' does not have a UV\n",
@@ -715,7 +718,8 @@
/* typecast avoids compiler warning */
qsort((void *)(afm->Encoding->glyphs), afm->Encoding->size,
- sizeof(UNICODEGLYPH), (__compar_fn_t)UnicodeGlyphByUV);
+ sizeof(UNICODEGLYPH),
+ (compar_callback_fn)UnicodeGlyphByUV);
for (i = 0; i < afm->Encoding->size; ++i)
if (afm->Encoding->glyphs[i].UV >= 0)
@@ -726,7 +730,7 @@
}
qsort(afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS),
- (__compar_fn_t)AFMMetricsByUV);
+ (compar_callback_fn)AFMMetricsByUV);
for (i = 0; i < afm->NumofMetrics; ++i)
if (afm->Metrics[i].UV >= 0)
More information about the wine-patches
mailing list