Commit 62c2096a338a09b6522a9e7e4118f2963cf541f0
2002-05-24T22:05:43
* 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)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/ChangeLog b/ChangeLog
index 4735fcf..e503f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-24 Tim Mooney <enchanter@users.sourceforge.net>
+
+ * 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 <wl@gnu.org>
* 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 0000000..37ebbd9
--- /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 <unistd.h>
+#endif
+#include <sys/mman.h>],
+[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 <sys/mman.h>])
+fi])
+
+AC_DEFUN(FT_MUNMAP_PARAM,
+[AC_MSG_CHECKING([for munmap's first parameter type])
+AC_TRY_COMPILE([
+#include <unistd.h>
+#include <sys/mman.h>
+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 e92696d..c062b0b 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;