diff options
| author | antirez <antirez@gmail.com> | 2015-01-09 11:22:14 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2015-01-09 11:23:22 +0100 |
| commit | 792a94153a44014b52655d4c1af0f298dc9dc9b1 (patch) | |
| tree | 6bc909491a63527b0261616640ade9a61abb73c3 /src | |
| parent | f3fd58eb4a0b2a2b5966e48c6b70c344f3bc248e (diff) | |
| download | redis-792a94153a44014b52655d4c1af0f298dc9dc9b1.tar.gz | |
Check for __sun macro in solarisfixes.h, not in includers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/redis.h | 3 | ||||
| -rw-r--r-- | src/sha1.c | 2 | ||||
| -rw-r--r-- | src/solarisfixes.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/redis.h b/src/redis.h index ab02275fb..54046ef27 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 <stdio.h> #include <stdlib.h> diff --git a/src/sha1.c b/src/sha1.c index 199545df4..7f73b40d3 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -24,9 +24,7 @@ A million repetitions of "a" #include <stdio.h> #include <string.h> #include <sys/types.h> /* 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 23025257a..3e53ba67c 100644 --- a/src/solarisfixes.h +++ b/src/solarisfixes.h @@ -28,6 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#if defined(__sun) + #if defined(__GNUC__) #include <math.h> #undef isnan @@ -48,3 +50,5 @@ #define u_int uint #define u_int32_t uint32_t #endif /* __GNUC__ */ + +#endif /* __sun */ |