Fix gcc-3.3 versions of macros to have the right return value.

Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of
        macros to have the right return value.

6 files changed, 76 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 82942340..8a754a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of 
+	macros to have the right return value.
+
+Mon Sep 15 17:07:58 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: Add property dependencies on mini-fribidi
+	and opentype convenience libraries.
+
 Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 82942340..8a754a31 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of 
+	macros to have the right return value.
+
+Mon Sep 15 17:07:58 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: Add property dependencies on mini-fribidi
+	and opentype convenience libraries.
+
 Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 82942340..8a754a31 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of 
+	macros to have the right return value.
+
+Mon Sep 15 17:07:58 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: Add property dependencies on mini-fribidi
+	and opentype convenience libraries.
+
 Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 82942340..8a754a31 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of 
+	macros to have the right return value.
+
+Mon Sep 15 17:07:58 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: Add property dependencies on mini-fribidi
+	and opentype convenience libraries.
+
 Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 82942340..8a754a31 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Mon Sep 15 17:16:59 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of 
+	macros to have the right return value.
+
+Mon Sep 15 17:07:58 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: Add property dependencies on mini-fribidi
+	and opentype convenience libraries.
+
 Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): 
diff --git a/pango/opentype/fterrcompat.h b/pango/opentype/fterrcompat.h
index f439293f..27b99751 100644
--- a/pango/opentype/fterrcompat.h
+++ b/pango/opentype/fterrcompat.h
@@ -34,30 +34,38 @@
  * 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_;                   				\
+#define ALLOC_ARRAY( _pointer_, _count_, _type_ ) ({		\
+  int result;							\
+  void *_tmp_;							\
+  result = FT_SET_ERROR ( FT_MEM_ALLOC_ARRAY ( _tmp_,		\
+                                               _count_,		\
+                                               _type_ ) );	\
+  _pointer_ = _tmp_;						\
+  result;							\
 })
 
 /* 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 REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ ) ({	\
+  int result;							\
+  void *_tmp_ = _pointer_;					\
+  result = FT_SET_ERROR ( FT_MEM_REALLOC( _tmp_,		\
+			 (_old_) * sizeof ( _type_ ),		\
+	                 (_new_) * sizeof ( _type_ ) ) );	\
+  _pointer_ = _tmp_;						\
+  result;							\
 })
  
-#define FREE( _pointer_ ) ({  \
-  void *_tmp_ = _pointer_;    \
-  FT_FREE ( _tmp_ );          \
-  _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_;                   \
+#define ALLOC( _pointer_, _size_ ) ({		\
+  int result;					\
+  void *_tmp_;					\
+  result = FT_ALLOC( _tmp_, _size_ );		\
+  _pointer_ = _tmp_;				\
+  result; 					\
 })
 #else
 #define ALLOC_ARRAY( _pointer_, _count_, _type_ ) \