From 792a94153a44014b52655d4c1af0f298dc9dc9b1 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 9 Jan 2015 11:22:14 +0100 Subject: [PATCH] Check for __sun macro in solarisfixes.h, not in includers. --- src/redis.h | 3 --- src/sha1.c | 2 -- src/solarisfixes.h | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/redis.h b/src/redis.h index ab02275f..54046ef2 100644 --- a/src/redis.h +++ b/src/redis.h @@ -32,10 +32,7 @@ #include "fmacros.h" #include "config.h" - -#if defined(__sun) #include "solarisfixes.h" -#endif #include #include diff --git a/src/sha1.c b/src/sha1.c index 199545df..7f73b40d 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -24,9 +24,7 @@ A million repetitions of "a" #include #include #include /* for u_int*_t */ -#if defined(__sun) #include "solarisfixes.h" -#endif #include "sha1.h" #include "config.h" diff --git a/src/solarisfixes.h b/src/solarisfixes.h index 23025257..3e53ba67 100644 --- a/src/solarisfixes.h +++ b/src/solarisfixes.h @@ -28,6 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#if defined(__sun) + #if defined(__GNUC__) #include #undef isnan @@ -48,3 +50,5 @@ #define u_int uint #define u_int32_t uint32_t #endif /* __GNUC__ */ + +#endif /* __sun */