When compiling with /opt/SUNWspro/SC4.2/bin/cc on Solaris, __svr4__ is

not defined, but __SVR4 is.

diff --git a/e_os.h b/e_os.h
index 4c39cb02380fbb1832b072f218de920188a40795..7e63d0130c846d5a8cdb4ab810cc05089b1cf7c3 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -403,7 +403,7 @@ extern HINSTANCE _hInstance;
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(sun) && !defined(__svr4__)
+#if defined(sun) && !defined(__svr4__) && !defined(__SVR4)

 #define memmove(s1,s2,b) bcopy((s2),(s1),(n))
 #define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
 #endif
 #define memmove(s1,s2,b) bcopy((s2),(s1),(n))
 #define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
 #endif