kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index ccf5ccc..018d619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-03  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/config/ftoption.h (FT_STRICT_ALIASING): Removed.
+
 2006-05-02  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/internal/ftmemory.h: s/new/newsz/ (for C++).
@@ -8,8 +12,8 @@
 
 	* src/base/ftstream.c (FT_Stream_EnterFrame): Add cast.
 
-	* include/freetype/config.h (FT_BASE_DEF) [__cplusplus]: Remove
-	`extern'.
+	* include/freetype/config/ftconfig.h (FT_BASE_DEF) [__cplusplus]:
+	Remove `extern'.
 
 2006-05-02  David Turner  <david@freetype.org>
 
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 7992a06..e4a445e 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -582,20 +582,6 @@ FT_BEGIN_HEADER
 
 
   /*
-   * This temporary macro is used to control whether we are going to compile
-   * certain functions like ft_mem_alloc in a way that prevents recent GCC
-   * releases from emitting zillions of `strict aliasing' warning messages
-   * each time a memory-management function is called.
-   *
-   * Note that it shouldn't be activated when building the library with
-   * a C++ compiler.
-   */
-#ifndef __cplusplus
-#define FT_STRICT_ALIASING
-#endif
-
-
-  /*
    * Define this variable if you want to keep the layout of internal
    * structures that was used prior to FreeType 2.2.  This also compiles in
    * a few obsolete functions to avoid linking problems on typical Unix