ftnames.h vs. ftsnames.h

[Francois Gouget]

   It looks like Slackware 8 has both headers which causes
'redefinition' errors. Maybe a compatibility feature?
   See bug 361:
   http://wine.codeweavers.com/bugzilla/show_bug.cgi?id=361

   Since both headers are supposed to contain the same thing, I modified
Wine to only include one of them.


Changelog:

 * dlls/gdi/freetype.c,
   dlls/wineps/truetype.c

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


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                     Avoid the Gates of Hell - use Linux.
-------------- next part --------------
Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.2
diff -u -r1.2 freetype.c
--- dlls/gdi/freetype.c	2001/10/23 20:06:33	1.2
+++ dlls/gdi/freetype.c	2001/12/23 06:59:39
@@ -36,11 +36,10 @@
 #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>
+#elifdef HAVE_FREETYPE_FTNAMES_H
+#include <freetype/ftnames.h>
 #endif
 #ifdef HAVE_FREETYPE_TTNAMEID_H
 #include <freetype/ttnameid.h>
Index: dlls/wineps/truetype.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/truetype.c,v
retrieving revision 1.12
diff -u -r1.12 truetype.c
--- dlls/wineps/truetype.c	2001/08/15 17:41:37	1.12
+++ dlls/wineps/truetype.c	2001/12/23 06:59:42
@@ -30,11 +30,10 @@
 #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>
+#elidef HAVE_FREETYPE_FTNAMES_H
+#include <freetype/ftnames.h>
 #endif
 #ifdef HAVE_FREETYPE_TTNAMEID_H
 #include <freetype/ttnameid.h>