Workaround for gcc compiler versions that don't have __builtin_expect yet.

diff --git a/iconv/glibc/ANSI_Z39.47.c b/iconv/glibc/ANSI_Z39.47.c
index 761bf0498322efbee9690852c48b98c6080c9f55..c553a9031bfed0712f7ebd7a11b48ac6f1cee9eb 100644 (file)
--- a/iconv/glibc/ANSI_Z39.47.c
+++ b/iconv/glibc/ANSI_Z39.47.c
@@ -36,6 +36,16 @@
 #include <string.h>
 #include "ANSI_Z39.47-tables.h"
 
+/* From /usr/include/linux/compiler.h out of GCC 2.96+: */
+/* Somewhere in the middle of the GCC 2.96 development cycle, we implemented
+   a mechanism by which the user can annotate likely branch directions and
+   expect the blocks to be reordered appropriately.  Define __builtin_expect
+   to nothing for earlier compilers.  */
+
+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#define __builtin_expect(x, expected_value) (x)
+#endif
+
 /* Omit first half of table: assume identity mapping (ASCII) */
 static const uint32_t to_ucs4[128] = TABLE_TO_UCS4_BASIC;