Skip to content

W
wine-winehq
Commit 809c45fc authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

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

parent 85129791
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/gdi/freetype.c
View file @ 809c45fc
......@@ -36,11 +36,12 @@ DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE_TTTABLES_H
#include <freetype/tttables.h>
#endif
#ifdef HAVE_FREETYPE_FTNAMES_H
#include <freetype/ftnames.h>
#endif
#ifdef HAVE_FREETYPE_FTSNAMES_H
#include <freetype/ftsnames.h>
#else
# ifdef HAVE_FREETYPE_FTNAMES_H
# include <freetype/ftnames.h>
# endif
#endif
#ifdef HAVE_FREETYPE_TTNAMEID_H
#include <freetype/ttnameid.h>
......
dlls/wineps/truetype.c
View file @ 809c45fc
......@@ -30,11 +30,12 @@
#ifdef HAVE_FREETYPE_TTTABLES_H
#include <freetype/tttables.h>
#endif
#ifdef HAVE_FREETYPE_FTNAMES_H
#include <freetype/ftnames.h>
#endif
#ifdef HAVE_FREETYPE_FTSNAMES_H
#include <freetype/ftsnames.h>
#else
# ifdef HAVE_FREETYPE_FTNAMES_H
# include <freetype/ftnames.h>
# endif
#endif
#ifdef HAVE_FREETYPE_TTNAMEID_H
#include <freetype/ttnameid.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment