Even inside #if 0 comments are comments.

[redis.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index f38ce872ede1961f74828975abeb56337abb2b31..136fd40c4c8eda0f89e975814de4127652c48ae8 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -25,7 +25,7 @@
 #endif
 
 /* Test for backtrace() */
 #endif
 
 /* Test for backtrace() */

-#if defined(__APPLE__) || defined(__linux__)
+#if defined(__APPLE__) || defined(__linux__) || defined(__sun)

 #define HAVE_BACKTRACE 1
 #endif
 
 #define HAVE_BACKTRACE 1
 #endif
 


@@ -59,10 +59,11 @@
 #define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
 #define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp)*/
 
 #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) || \
 #endif
 
 #if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \


@@ -96,4 +97,12 @@
 #error "Undefined or invalid BYTE_ORDER"
 #endif
 
 #error "Undefined or invalid BYTE_ORDER"
 #endif
 

+#if (__i386 || __amd64) && __GNUC__
+#define GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if GNUC_VERSION >= 40100
+#define HAVE_ATOMIC
+#endif
+#endif
+
+

 #endif
 #endif