Changeset 412 for trunk/src/3rdparty

Timestamp:

Dec 10, 2009, 10:30:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Made it build using GCC4 and fixed a couple warnings.

File:

• trunk/src/3rdparty/freetype/include/freetype/config/ftheader.h (modified) (2 diffs)

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
+#if defined(__OS2__) && defined(__GNUC__) && \
+    __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
@@ -181 +181 @@
     // 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
+# define FT_FREETYPE_H  <freetype/freetype.os2-g++.h>
 #else
 #define FT_FREETYPE_H  <freetype/freetype.h>