/dlls/gdi/freetype.c breakage

[Gerald Pfeifer]

The following patch to dlls/gdi/freetype.c

  revision 1.52
  date: 2004/01/18 23:35:13;  author: julliard;  state: Exp;  lines: +3 -4
  Use the exported FONTENUMPROCW as parameter in the EnumDeviceFonts
  driver function instead of defining a private function type.

breaks compilation

  freetype.c:2521: error: syntax error before "DEVICEFONTENUMPROC"
  freetype.c: In function `WineEngEnumFonts':
  freetype.c:2522: error: number of arguments doesn't match prototype
  gdi_private.h:220: error: prototype declaration

on a system with FreeType 2.1.4 and XFree86 4.3.0.

The problem seems that DEVICEFONTENUMPROC is not defined, though on some
of my other test boxes with slightly different versions of FreeType, I did
not see this problem.

http://www.rtp.freebsd.org/~gerald/config.h contains the config.h file
from autoconf.

Gerald
-- 
Gerald Pfeifer (Jerry)   gerald(a)pfeifer.com   http://www.pfeifer.com/gerald/

[Huw D M Davies]

On Mon, Jan 19, 2004 at 11:08:09AM +0100, Gerald Pfeifer wrote:
> The following patch to dlls/gdi/freetype.c
>
> revision 1.52
>   date: 2004/01/18 23:35:13;  author: julliard;  state: Exp;  lines: +3 -4
>   Use the exported FONTENUMPROCW as parameter in the EnumDeviceFonts
>   driver function instead of defining a private function type.
>
> breaks compilation
>
> freetype.c:2521: error: syntax error before "DEVICEFONTENUMPROC"
>   freetype.c: In function `WineEngEnumFonts':
>   freetype.c:2522: error: number of arguments doesn't match prototype
>   gdi_private.h:220: error: prototype declaration
>
> on a system with FreeType 2.1.4 and XFree86 4.3.0.
>
> The problem seems that DEVICEFONTENUMPROC is not defined, though on some
> of my other test boxes with slightly different versions of FreeType, I did
> not see this problem.
>
> http://www.rtp.freebsd.org/~gerald/config.h contains the config.h file
> from autoconf.

Looks like we're not finding freetype on your system for some reason.
This should fix the compilation.
-- 
Huw Davies
huw(a)codeweavers.com
Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.52
diff -u -r1.52 freetype.c
--- dlls/gdi/freetype.c	18 Jan 2004 23:35:13 -0000	1.52
+++ dlls/gdi/freetype.c	19 Jan 2004 17:31:52 -0000
@@ -2518,7 +2518,7 @@
     return FALSE;
 }
 
-DWORD WineEngEnumFonts(LPLOGFONTW plf, DEVICEFONTENUMPROC proc, LPARAM lparam)
+DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam)
 {
     return 1;
 }