freetype-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Two build fixes for watcom compiler:


From: Ozkan Sezer
Subject: Two build fixes for watcom compiler:
Date: Thu, 13 Jan 2022 19:24:11 +0300

1. include/freetype/internal/compiler-macros.h (FT_CALLBACK_DEF):
don't define as __cdecl for Watcom builds.

Otherwise, conflicts happen with Watcom default calling convention
which is 'watcall'. E.g.:

src/base/ftrfork.c(292): Error! E1071: Type of parameter 4 does not
agree with previous definition
src/base/ftrfork.c(292): Note! I2003: source conversion type is 'int
(__cdecl *)(void const *__p1,void const *__p2)'
src/base/ftrfork.c(292): Note! I2004: target conversion type is 'int
(*)(void const *__p1,void const *__p2)'
src/base/ftrfork.c(292): Note! I2002: 'qsort' defined in:
/opt/watcom/h/stdlib.h(213)


2. src/sdf/ftbsdf.c: undefine 'near' for Watcom builds

Watcom defines near to its __near keyword and build fails otherwise:

src/sdf/ftbsdf.c(598): Error! E1016: Expecting identifier
src/sdf/ftbsdf.c(602): Error! E1016: Expecting identifier
src/sdf/ftbsdf.c(602): Error! E1151: Parameter count does not agree
with previous definition
src/sdf/ftbsdf.c(602): Note! I2002: 'FT_Vector_Length' defined in:
include/freetype/fttrigon.h(288)
src/sdf/ftbsdf.c(608): Error! E1016: Expecting identifier
src/sdf/ftbsdf.c(609): Error! E1016: Expecting identifier
src/sdf/ftbsdf.c(876): Error! E1016: Expecting identifier
src/sdf/ftbsdf.c(885): Error! E1016: Expecting identifier


Patches are attached.

Regards.
--
O.S.

Attachment: 0001.patch
Description: Text Data

Attachment: 0002.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]