From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 10 Nov 2009 14:44:34 +0000 (+0100)
Subject: Revert some Opensolaris changes, support SunOS again.
X-Git-Tag: SQUID_3_2_0_1~592
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc7b406849e97b383136ad389a1f3f985c582542;p=thirdparty%2Fsquid.git

Revert some Opensolaris changes, support SunOS again.
---

diff --git a/compat/compat.h b/compat/compat.h
index fc9eb9360e..1600291711 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -49,7 +49,6 @@
 /* OS-macro wrapping should be done inside the OS .h */
 /*****************************************************/
 
-#include "compat/os/solaris.h"
 #include "compat/os/aix.h"
 #include "compat/os/dragonfly.h"
 #include "compat/os/freebsd.h"
@@ -61,6 +60,7 @@
 #include "compat/os/os2.h"
 #include "compat/os/qnx.h"
 #include "compat/os/sgi.h"
+#include "compat/os/solaris.h"
 #include "compat/os/sunos.h"
 #include "compat/os/windows.h"
 
diff --git a/compat/osdetect.h b/compat/osdetect.h
index 7a68dc705f..e5a08904e5 100644
--- a/compat/osdetect.h
+++ b/compat/osdetect.h
@@ -17,7 +17,13 @@
 
 /* SUN SOLARIS / OPENSOLARIS */
 #if defined(__sun__) || defined(__sun) || defined(__SUNPRO_CC) || defined(__SunOS_OSversion)
+#define _SQUID_SUN_ 1 /* SunOS */
+
+#if defined(__SVR4) /* Solaris */
 #define _SQUID_SOLARIS_ 1
+#else /* SunOS */
+#define _SQUID_SUNOS_ 1
+#endif /* __SVR4 */
 
 #elif defined(__hpux)		/* HP-UX - SysV-like? */
 #define _SQUID_HPUX_ 1