Commit 50cdedd1 authored by antirez's avatar antirez
Browse files

Check for __sun macro in solarisfixes.h, not in includers.

parent 77608ae5
...@@ -32,10 +32,7 @@ ...@@ -32,10 +32,7 @@
#include "fmacros.h" #include "fmacros.h"
#include "config.h" #include "config.h"
#if defined(__sun)
#include "solarisfixes.h" #include "solarisfixes.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -24,9 +24,7 @@ A million repetitions of "a" ...@@ -24,9 +24,7 @@ A million repetitions of "a"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/types.h> /* for u_int*_t */ #include <sys/types.h> /* for u_int*_t */
#if defined(__sun)
#include "solarisfixes.h" #include "solarisfixes.h"
#endif
#include "sha1.h" #include "sha1.h"
#include "config.h" #include "config.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#if defined(__sun)
#if defined(__GNUC__) #if defined(__GNUC__)
#include <math.h> #include <math.h>
#undef isnan #undef isnan
...@@ -48,3 +50,5 @@ ...@@ -48,3 +50,5 @@
#define u_int uint #define u_int uint
#define u_int32_t uint32_t #define u_int32_t uint32_t
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#endif /* __sun */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment