Huw Davies : gdi: Use correct include file for FT_Get_Module.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 24 06:44:48 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 603d21cbc4fc8b915248cd3a6f90b02f721980c4
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=603d21cbc4fc8b915248cd3a6f90b02f721980c4
Author: Huw Davies <huw at codeweavers.com>
Date: Tue Jan 24 10:57:35 2006 +0100
gdi: Use correct include file for FT_Get_Module.
---
configure | 2 ++
configure.ac | 1 +
dlls/gdi/freetype.c | 3 +++
include/config.h.in | 3 +++
4 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index c95d335..31005df 100755
--- a/configure
+++ b/configure
@@ -10042,6 +10042,7 @@ fi
+
for ac_header in ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \
@@ -10051,6 +10052,7 @@ for ac_header in ft2build.h \
freetype/ttnameid.h \
freetype/ftoutln.h \
freetype/ftwinfnt.h \
+ freetype/ftmodapi.h \
freetype/internal/sfnt.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.ac b/configure.ac
index ca5eb8a..761f528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,6 +596,7 @@ else
freetype/ttnameid.h \
freetype/ftoutln.h \
freetype/ftwinfnt.h \
+ freetype/ftmodapi.h \
freetype/internal/sfnt.h,,,
[#if HAVE_FT2BUILD_H
#include <ft2build.h>
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index 3023ab3..314afd8 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -82,6 +82,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE_FTWINFNT_H
#include <freetype/ftwinfnt.h>
#endif
+#ifdef HAVE_FREETYPE_FTMODAPI_H
+#include <freetype/ftmodapi.h>
+#endif
#ifndef SONAME_LIBFREETYPE
#define SONAME_LIBFREETYPE "libfreetype.so"
diff --git a/include/config.h.in b/include/config.h.in
index 51ecdc5..421a5eb 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -101,6 +101,9 @@
/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
#undef HAVE_FREETYPE_FTGLYPH_H
+/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
+#undef HAVE_FREETYPE_FTMODAPI_H
+
/* Define to 1 if you have the <freetype/ftnames.h> header file. */
#undef HAVE_FREETYPE_FTNAMES_H
More information about the wine-cvs
mailing list