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

Include ftsnames.h or ftnames.h, not both.

This commit is contained in:
Francois Gouget 2001-12-24 21:10:31 +00:00 committed by Alexandre Julliard
parent 851297919b
commit 809c45fc50
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/gdi/freetype.c
View File

@ -36,11 +36,12 @@ DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE_TTTABLES_H #ifdef HAVE_FREETYPE_TTTABLES_H
#include <freetype/tttables.h> #include <freetype/tttables.h>
#endif #endif
#ifdef HAVE_FREETYPE_FTNAMES_H
#include <freetype/ftnames.h>
#endif
#ifdef HAVE_FREETYPE_FTSNAMES_H #ifdef HAVE_FREETYPE_FTSNAMES_H
#include <freetype/ftsnames.h> #include <freetype/ftsnames.h>
#else
# ifdef HAVE_FREETYPE_FTNAMES_H
# include <freetype/ftnames.h>
# endif
#endif #endif
#ifdef HAVE_FREETYPE_TTNAMEID_H #ifdef HAVE_FREETYPE_TTNAMEID_H
#include <freetype/ttnameid.h> #include <freetype/ttnameid.h>

7
dlls/wineps/truetype.c
View File

@ -30,11 +30,12 @@
#ifdef HAVE_FREETYPE_TTTABLES_H #ifdef HAVE_FREETYPE_TTTABLES_H
#include <freetype/tttables.h> #include <freetype/tttables.h>
#endif #endif
#ifdef HAVE_FREETYPE_FTNAMES_H
#include <freetype/ftnames.h>
#endif
#ifdef HAVE_FREETYPE_FTSNAMES_H #ifdef HAVE_FREETYPE_FTSNAMES_H
#include <freetype/ftsnames.h> #include <freetype/ftsnames.h>
#else
# ifdef HAVE_FREETYPE_FTNAMES_H
# include <freetype/ftnames.h>
# endif
#endif #endif
#ifdef HAVE_FREETYPE_TTNAMEID_H #ifdef HAVE_FREETYPE_TTNAMEID_H
#include <freetype/ttnameid.h> #include <freetype/ttnameid.h>