From 809c45fc50eac3e0beb1ddbdadf2034d40ae0a09 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Mon, 24 Dec 2001 21:10:31 +0000
Subject: [PATCH] Include ftsnames.h or ftnames.h, not both.

---
 dlls/gdi/freetype.c    | 7 ++++---
 dlls/wineps/truetype.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index a8616b1f07e..5d1fd91c45b 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -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>
diff --git a/dlls/wineps/truetype.c b/dlls/wineps/truetype.c
index 8e81930d01b..c7dbed78bde 100644
--- a/dlls/wineps/truetype.c
+++ b/dlls/wineps/truetype.c
@@ -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>