* include/freetype/*: Add a guard to all public header files which

21 years ago · b09515afca
parent f1e0516dc3
commit b09515afca
21 changed files with 133 additions and 6 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2003-11-03  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/*: Add a guard to all public header files which
+	load FT_FREETYPE_H to reject freetype.h from FreeType 1.
+
 2003-11-02  Patrick Welche  <prlw1@newn.cam.ac.uk>

 	* builds/unix/freetype2.m4, builds/unix/ft-munmap.m4: Protect
--- a/include/freetype/cache/ftlru.h
+++ b/include/freetype/cache/ftlru.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Simple LRU list-cache (specification).                               */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -62,6 +62,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType exact bbox computation (specification).                     */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -34,6 +34,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftbdf.h
+++ b/include/freetype/ftbdf.h
@ -22,6 +22,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@ -36,6 +36,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftgzip.h
+++ b/include/freetype/ftgzip.h
@ -22,6 +22,13 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
 FT_BEGIN_HEADER

  /*************************************************************************/
--- a/include/freetype/ftincrem.h
+++ b/include/freetype/ftincrem.h
@ -22,6 +22,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Generic list support for FreeType (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -31,6 +31,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftmodapi.h
+++ b/include/freetype/ftmodapi.h
@ -23,6 +23,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@ -24,6 +24,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftpfr.h
+++ b/include/freetype/ftpfr.h
@ -22,6 +22,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftsizes.h
+++ b/include/freetype/ftsizes.h
@ -32,6 +32,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftsnames.h
+++ b/include/freetype/ftsnames.h
@ -7,7 +7,7 @@
 /*                                                                         */
 /*    This is _not_ used to retrieve glyph names!                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -26,6 +26,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@ -5,7 +5,7 @@
 /*    FreeType synthesizing code for emboldening and slanting              */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
+/*  Copyright 2000-2001, 2003 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -41,6 +41,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/fttrigon.h
+++ b/include/freetype/fttrigon.h
@ -21,6 +21,12 @@

 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftwinfnt.h
+++ b/include/freetype/ftwinfnt.h
@ -22,6 +22,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ftxf86.h
+++ b/include/freetype/ftxf86.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Support functions for X11.                                           */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2003 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -22,6 +22,13 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
 FT_BEGIN_HEADER

  /* this comment is intentionally disabled for now, to prevent this       */
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@ -24,6 +24,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@ -24,6 +24,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@ -23,6 +23,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER

--- a/include/freetype/ttunpat.h
+++ b/include/freetype/ttunpat.h
@ -25,6 +25,12 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+

 FT_BEGIN_HEADER