From 2523267c5919a4ad7f5658e51069d5351606b429 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 24 May 2002 22:05:43 +0000 Subject: [PATCH] * builds/unix/ft-munmap.m4: New file, extracted FT_MUNMAP_DECL and FT_MUNMAP_PARAM from aclocal.m4 into here, so aclocal.m4 can be rebuilt from sources. Set macro serial to 1, and use third argument to AC_DEFINE for our two custom symbols, so ftconfig.in could one day be rebuilt with autoheader (not recommended now, ftconfig.in is a custom source file) --- ChangeLog | 9 +++++++++ builds/unix/ft-munmap.m4 | 31 +++++++++++++++++++++++++++++++ src/type42/t42drivr.c | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 builds/unix/ft-munmap.m4 diff --git a/ChangeLog b/ChangeLog index 4735fcfe0..e503f5841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-05-24 Tim Mooney + + * builds/unix/ft-munmap.m4: New file, extracted FT_MUNMAP_DECL and + FT_MUNMAP_PARAM from aclocal.m4 into here, so aclocal.m4 can be + rebuilt from sources. Set macro serial to 1, and use third argument + to AC_DEFINE for our two custom symbols, so ftconfig.in could one day + be rebuilt with autoheader (not recommended now, ftconfig.in is a + custom source file) + 2002-05-22 Werner Lemberg * include/freetype/config/ftheader.h (FT_BEZIER_H): Removed. diff --git a/builds/unix/ft-munmap.m4 b/builds/unix/ft-munmap.m4 new file mode 100644 index 000000000..37ebbd92d --- /dev/null +++ b/builds/unix/ft-munmap.m4 @@ -0,0 +1,31 @@ +## FreeType specific autoconf tests + +# serial 1 FT_MUNMAP_DECL + +AC_DEFUN(FT_MUNMAP_DECL, +[AC_MSG_CHECKING([whether munmap must be declared]) +AC_CACHE_VAL(ft_cv_munmap_decl, +[AC_TRY_COMPILE([ +#ifdef HAVE_UNISTD_H +#include +#endif +#include ], +[char *(*pfn) = (char *(*))munmap], +ft_cv_munmap_decl=no, +ft_cv_munmap_decl=yes)]) +AC_MSG_RESULT($ft_cv_munmap_decl) +if test $ft_cv_munmap_decl = yes; then + AC_DEFINE(NEED_MUNMAP_DECL,, + [Define to 1 if munmap() is not defined in ]) +fi]) + +AC_DEFUN(FT_MUNMAP_PARAM, +[AC_MSG_CHECKING([for munmap's first parameter type]) +AC_TRY_COMPILE([ +#include +#include +int munmap(void *, size_t);],, + AC_MSG_RESULT([void *]);AC_DEFINE(MUNMAP_USES_VOIDP,, + [Define to 1 if the first argument of munmap is of type void *]), + AC_MSG_RESULT([char *])) +]) diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c index e92696d01..c062b0bc6 100644 --- a/src/type42/t42drivr.c +++ b/src/type42/t42drivr.c @@ -1648,7 +1648,7 @@ static FT_Error T42_Size_Init( T42_Size size ) { - FT_Face face = size->root.face; + FT_Face face = size->root.face; T42_Face t42face = (T42_Face)face; FT_Size ttsize; FT_Error error = T42_Err_Ok;