ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Remove no longer needed include file.

This commit is contained in:
Huw Davies 2011-10-11 10:14:55 +01:00 committed by Alexandre Julliard
parent e973115a79
commit 6ee2eaeff2
4 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -10262,8 +10262,7 @@ fi
freetype/ftoutln.h \ freetype/ftoutln.h \
freetype/ftwinfnt.h \ freetype/ftwinfnt.h \
freetype/ftmodapi.h \ freetype/ftmodapi.h \
freetype/ftlcdfil.h \ freetype/ftlcdfil.h
freetype/internal/sfnt.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
@ -10304,21 +10303,6 @@ _ACEOF
fi fi
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ac_freetype_libs"
for ac_func in FT_Load_Sfnt_Table
do :
ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table"
if test "x$ac_cv_func_FT_Load_Sfnt_Table" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FT_LOAD_SFNT_TABLE 1
_ACEOF
fi
done
CFLAGS="$ac_save_CFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS"
if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
then then

8
configure.ac
View File

@ -1373,8 +1373,7 @@ then
freetype/ftoutln.h \ freetype/ftoutln.h \
freetype/ftwinfnt.h \ freetype/ftwinfnt.h \
freetype/ftmodapi.h \ freetype/ftmodapi.h \
freetype/ftlcdfil.h \ freetype/ftlcdfil.h,,,
freetype/internal/sfnt.h,,,
[#ifdef HAVE_FT2BUILD_H [#ifdef HAVE_FT2BUILD_H
# include <ft2build.h> # include <ft2build.h>
#endif]) #endif])
@ -1383,11 +1382,6 @@ then
[Define if you have the <freetype/fttrigon.h> header file.]) [Define if you have the <freetype/fttrigon.h> header file.])
wine_cv_fttrigon=yes],[wine_cv_fttrigon=no]) wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>]) AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ac_freetype_libs"
AC_CHECK_FUNCS(FT_Load_Sfnt_Table)
CFLAGS="$ac_save_CFLAGS"
CPPFLAGS="$ac_save_CPPFLAGS"
dnl Check that we have at least freetype/freetype.h dnl Check that we have at least freetype/freetype.h
if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
then then

3
dlls/gdi32/freetype.c
View File

@ -117,9 +117,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE_FTOUTLN_H #ifdef HAVE_FREETYPE_FTOUTLN_H
#include <freetype/ftoutln.h> #include <freetype/ftoutln.h>
#endif #endif
#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H
#include <freetype/internal/sfnt.h>
#endif
#ifdef HAVE_FREETYPE_FTTRIGON_H #ifdef HAVE_FREETYPE_FTTRIGON_H
#include <freetype/fttrigon.h> #include <freetype/fttrigon.h>
#endif #endif

6
include/config.h.in
View File

@ -152,9 +152,6 @@
/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
#undef HAVE_FREETYPE_FTWINFNT_H #undef HAVE_FREETYPE_FTWINFNT_H
/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
#undef HAVE_FREETYPE_INTERNAL_SFNT_H
/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */
#undef HAVE_FREETYPE_TTNAMEID_H #undef HAVE_FREETYPE_TTNAMEID_H
@ -179,9 +176,6 @@
/* Define to 1 if you have the `ftruncate' function. */ /* Define to 1 if you have the `ftruncate' function. */
#undef HAVE_FTRUNCATE #undef HAVE_FTRUNCATE
/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */
#undef HAVE_FT_LOAD_SFNT_TABLE
/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ /* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */
#undef HAVE_FT_TRUETYPEENGINETYPE #undef HAVE_FT_TRUETYPEENGINETYPE