freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI'

[Andriy Palamarchuk]

After refreshing today morning from CVS I got the
compilation error.
The complete error text:

freetype.c:1852: conflicting types for
`WineEngGetTextExtentPointI'
../../include/font.h:102: previous declaration of
`WineEngGetTextExtentPointI'
make[2]: *** [freetype.o] Error 1
make[2]: Leaving directory
`/mnt/buf/prj/wine/dlls/gdi'
make[1]: *** [gdi/gdi32.dll.so] Error 2
make[1]: Leaving directory `/mnt/buf/prj/wine/dlls'
make: *** [dlls] Error 2

Huw, can it be because of your yesterday's patch?
Other relevant patch is Alexandre's change to
configure.

Let me know if you need additional information.

Andriy Palamarchuk

__________________________________________________
Do You Yahoo!?
Yahoo! Tax Center - online filing with TurboTax
http://taxes.yahoo.com/

[Huw Davies]

On Thu, Apr 04, 2002 at 06:12:43AM -0800, Andriy Palamarchuk wrote:
> After refreshing today morning from CVS I got the
> compilation error.
> The complete error text:
>
> freetype.c:1852: conflicting types for
> `WineEngGetTextExtentPointI'
> ../../include/font.h:102: previous declaration of
> `WineEngGetTextExtentPointI'
> make[2]: *** [freetype.o] Error 1
> make[2]: Leaving directory
> `/mnt/buf/prj/wine/dlls/gdi'
> make[1]: *** [gdi/gdi32.dll.so] Error 2
> make[1]: Leaving directory `/mnt/buf/prj/wine/dlls'
> make: *** [dlls] Error 2
>
> Huw, can it be because of your yesterday's patch?
> Other relevant patch is Alexandre's change to
> configure.
>
> Let me know if you need additional information.

Alexandre changed the LPWORD to const WORD* in my patch but I guess
forgot to change the type in dlls/gdi/font.c . There's already a patch
in wine-patches that should fix this.

Huw.
--
Huw Davies
huw(a)codeweavers.com

[Martin Wilck]

This one-liner fixes it:

--- dlls/gdi/freetype.c~	Thu Apr  4 09:17:14 2002
+++ dlls/gdi/freetype.c	Thu Apr  4 09:30:48 2002
@@ -1847,7 +1847,7 @@
     return FALSE;
 }

-BOOL WineEngGetTextExtentPointI(GdiFont font, LPWORD indices, INT count,
+BOOL WineEngGetTextExtentPointI(GdiFont font, const WORD *indices, INT count,
 				LPSIZE size)
 {
     ERR("called but we don't have FreeType\n");

-- 
Martin Wilck                Phone: [phone]
Fujitsu Siemens Computers   Fax:   [phone]
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck(a)Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy