From bcf81bcc80c6235dfbc7eeaa34ed21ea329c7a3d Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Fri, 22 Aug 2003 22:52:08 +0000
Subject: [PATCH] Add some macro definitions for gcc-3.3 that suppress the
 bogus

Fri Aug 22 18:09:52 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/fterrcompat.h: Add some macro definitions
        for gcc-3.3 that suppress the bogus strict-aliasing
        warnings.

        * pango/pango-utils.c (read_config_file): Use
        g_hash_table_new_full() to simplify code and fix
        gcc-3.3 warnings.

        * pango/pangox-fontmap.c (pango_x_real_get_coverage_win)
        * pango/querymodules.c (query_module): Suppress gcc-3.3
        warnings.

        * pango/modules.c (pango_find_map): Fix warning from
        missing declaration of pango_module_get_type().

        * pango/pango-context.c/pango-engine.c: Fix name confusion
        for pango_get_fallback_shaper().
---
 src/fterrcompat.h | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/fterrcompat.h b/src/fterrcompat.h
index 223a993dd..f439293f1 100644
--- a/src/fterrcompat.h
+++ b/src/fterrcompat.h
@@ -29,6 +29,37 @@
 #define GET_ULong()     FT_GET_ULONG()
 #define GET_Tag4()      FT_GET_TAG4()
 
+/* Macro definitions to avoid bogus warnings about strict
+ * aliasing. These make code generation worse, so we only
+ * use them when necessary
+ */
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+#define ALLOC_ARRAY( _pointer_, _count_, _type_ ) ({            \
+  void *_tmp_;             	       		     	        \
+  FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( _tmp_, _count_, _type_ ));  \
+  _pointer_ = _tmp_;                   				\
+})
+
+/* FT_MEM_REALLOC macro broken in 2.1.0 */
+#define REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ ) ({       \
+  void *_tmp_;             	       		     	          \
+  FT_SET_ERROR ( FT_MEM_REALLOC( _tmp_,                           \
+				 (_old_) * sizeof ( _type_ ),     \
+		                 (_new_) * sizeof ( _type_ ) ) ); \
+  _pointer_ = _tmp_;                   				  \
+})
+ 
+#define FREE( _pointer_ ) ({  \
+  void *_tmp_ = _pointer_;    \
+  FT_FREE ( _tmp_ );          \
+  _pointer_ = _tmp_;          \
+})
+#define ALLOC( _pointer_, _size_ ) ({  \
+  void *_tmp_;             	       \
+  FT_ALLOC( _tmp_, _size_ );           \
+  _pointer_ = _tmp_;                   \
+})
+#else
 #define ALLOC_ARRAY( _pointer_, _count_, _type_ ) \
   FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( _pointer_, _count_, _type_))
 
@@ -37,11 +68,12 @@
   FT_SET_ERROR ( FT_MEM_REALLOC( _pointer_, (_old_) * sizeof ( _type_ ),   \
 		(_new_) * sizeof ( _type_ ) ) )
 
-#define ALLOC( _pointer_, _size_ ) FT_ALLOC( _pointer_, _size_ )
 #define FREE( _pointer_ )          FT_FREE( _pointer_ )
+#define ALLOC( _pointer_, _size_ ) FT_ALLOC( _pointer_, _size_ )
+#endif /* gcc >= 3.3 */
 
 #define MEM_Copy( dest, source, count ) FT_MEM_COPY( dest, source, count )
 
-#endif /* >= 2.1.0 */
+#endif /* freetype >= 2.1.0 */
 
 #endif /* FTERRCOMPAT_H */