>From 755a8e234f2746b71085b2d9829c4f0a03290977 Mon Sep 17 00:00:00 2001
From: Michele La Monaca
Date: Sat, 11 May 2013 00:32:09 +0200
Subject: [PATCH] more general macros for solaris platform recognition
Signed-off-by: Peter Bex
---
chicken.h | 14 +++++++-------
posixunix.scm | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/chicken.h b/chicken.h
index 53553c5..ce54b3c 100644
--- a/chicken.h
+++ b/chicken.h
@@ -89,7 +89,7 @@
# define C_NONUNIX
#endif
-#if defined(__sun__) && defined(__svr4__)
+#if defined(__sun) && defined(__SVR4)
# define C_SOLARIS
#endif
@@ -135,9 +135,9 @@
# include
#elif defined(_AIX)
# include
-#elif defined(__sun__)
+#elif defined(__sun)
# include
-#elif defined(__svr4__)
+#elif defined(__SVR4)
# include
#endif
@@ -530,7 +530,7 @@ static inline int isinf_ld (long double x)
#define C_uword unsigned C_word
#define C_header C_uword
-#if defined(__sun__) && !defined(__svr4__)
+#if defined(__sun) && !defined(__SVR4)
/* SunOS is supposed not to have stdint.h */
# include
#else
@@ -709,8 +709,8 @@ static inline int isinf_ld (long double x)
# define C_SOFTWARE_VERSION "dragonfly"
#elif defined(__HAIKU__)
# define C_SOFTWARE_VERSION "haiku"
-#elif defined(__sun__)
-# if defined(__svr4__)
+#elif defined(__sun)
+# if defined(__SVR4)
# define C_SOFTWARE_VERSION "solaris"
# else
# define C_SOFTWARE_VERSION "sunos"
@@ -2865,7 +2865,7 @@ C_path_to_executable(C_char *fname)
return buffer;
}
else return NULL;
-# elif defined(__unix__) || defined(C_XXXBSD)
+# elif defined(__unix__) || defined(__unix) || defined(C_XXXBSD)
int i, j, k, l;
C_char *path, *dname;
diff --git a/posixunix.scm b/posixunix.scm
index d7c64f5..a2776da 100644
--- a/posixunix.scm
+++ b/posixunix.scm
@@ -58,7 +58,7 @@ static C_TLS int C_wait_status;
#include
#include
-#if defined(__sun__) && defined(__svr4__)
+#if defined(__sun) && defined(__SVR4)
# include
# include
#endif
--
1.8.0.1