Revert some Opensolaris changes, support SunOS again.

diff --git a/compat/compat.h b/compat/compat.h
index fc9eb9360e2730b853cf08efee12d6e532e96d98..160029171180cda5f86a060f0fa4ce7f462c08e1 100644 (file)
--- 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 7a68dc705f1a5ee473b7759942b274facdaf8e57..e5a08904e516899a57d50654069187fdc85fadeb 100644 (file)
--- 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