Changeset 395 for trunk/src

Timestamp:

Dec 5, 2009, 6:37:27 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty/freetype: Added a better temporary workaround for the GCC 3.3.5 bug not allowing to include freetype.h in sources. Should be removed when we upgrade to GCC 4.

Location:

trunk/src/3rdparty/freetype/include/freetype

Files:

• config/ftheader.h (modified) (1 diff)
• freetype.os2-g++.h (added)

trunk/src/3rdparty/freetype/include/freetype/config/ftheader.h

@@ -171 +171 @@
    *
    */
+#if defined(__OS2__) && defined(__GNUC__)
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ == 5
+    // GCC for OS/2 version 3.3.5 CSD3 doesn't like the style of the
+    // comments in the ../3rdparty/freetype/include/freetype/freetype.h file
+    // (included by the FT_FREETYPE_H argument below). This sed command
+    //   sed -e "/^ *\/\*.*\*\/ *$/ d" freetype.h > freetype.os2-g++.h
+    // proves it: freetype.os2-g++.h stops showing the mystic "Invalid argument"
+    // compiler error generated for the original. Looks like a compiler bug.
+    // Until we upgrade GCC to a version that is free of it, we use this sed'ed
+    // header as a temporary workaround.
+#  define FT_FREETYPE_H  <freetype/freetype.os2-g++.h>
+# else
+    // On a newer compiler that works, we should completely remove any traces of
+    // this workaround from this file
+#  error "Please check the comment above this line!"
+# endif
+#else
 #define FT_FREETYPE_H  <freetype/freetype.h>
+#endif