Index: base/gsropt.h
--- base/gsropt.h.orig	2011-03-11 06:45:19.000000000 +0100
+++ base/gsropt.h	2011-04-02 22:59:43.000000000 +0200
@@ -379,17 +379,6 @@
 
 #elif defined(__GNUC__) /* Are we using GCC? */
 
-#ifdef __i386__ /* Are we on an x86? */
-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40300 /* Modern enough to have byteswap intrinsics? */
-
-#include <byteswap.h>
-
-#define ENDIAN_SWAP_INT bswap_32
-
-#endif /* GCC >= 4.3 */
-#endif /* x86 or later */
-
 #endif
 
 #endif /* gsropt_INCLUDED */
Index: base/stdint_.h
--- base/stdint_.h.orig	2010-07-30 13:03:27.000000000 +0200
+++ base/stdint_.h	2011-04-02 22:55:44.000000000 +0200
@@ -68,6 +68,13 @@
    typedef unsigned long long uint64_t;
 #  define STDINT_TYPES_DEFINED
 # endif
+#ifdef __sun__
+#  include <sys/int_types.h>
+#  define STDINT_TYPES_DEFINED
+#endif
+#ifdef __FreeBSD__
+#  define STDINT_TYPES_DEFINED
+#endif
    /* other archs may want to add defines here, 
       or use the fallbacks in std.h */
 #endif