Version bumped to 2.5.10 (2.6 RC4) + Release Notes.

[redis.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 2bf0f93403198876226d92f9ed5f3a982c215b75..28ef37d6ed01043a6000856de653608604218b51 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -38,6 +38,13 @@
 #define HAVE_KQUEUE 1
 #endif
 
+#ifdef __sun
+#include <sys/feature_tests.h>
+#ifdef _DTRACE_VERSION
+#define HAVE_EVPORT 1
+#endif
+#endif
+
 /* Define aof_fsync to fdatasync() in Linux and fsync() for all the rest */
 #ifdef __linux__
 #define aof_fsync fdatasync
@@ -59,10 +66,11 @@
 #define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
 #define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp)*/
 
-#if defined(vax) || defined(ns32000) || defined(sun386) || defined(__i386__) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha)
-#define BYTE_ORDER     LITTLE_ENDIAN
+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \
+   defined(vax) || defined(ns32000) || defined(sun386) || \
+   defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
+   defined(__alpha__) || defined(__alpha)
+#define BYTE_ORDER    LITTLE_ENDIAN
 #endif
 
 #if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \
@@ -97,11 +105,10 @@
 #endif
 
 #if (__i386 || __amd64) && __GNUC__
-    #include <features.h>
-
-    #if __GNUC_PREREQ(4,1)
-        #define HAVE_ATOMIC
-    #endif
+#define GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if GNUC_VERSION >= 40100
+#define HAVE_ATOMIC
+#endif
 #endif