From ccc0401850c2f265348f879dea7945d9c2b55ba2 Mon Sep 17 00:00:00 2001
From: Thomas Ries <tries@gmx.net>
Date: Thu, 20 Nov 2003 07:17:18 +0000
Subject: [PATCH] - explicitely use _SOLARIS2 macro instead of just _SOLARIS

---
 config.h.in  | 4 ++--
 configure.in | 2 +-
 src/utils.c  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/config.h.in b/config.h.in
index 1687e4b..ceaf657 100644
--- a/config.h.in
+++ b/config.h.in
@@ -177,8 +177,8 @@
 /* building on BSD/OS platform */
 #undef _BSDOS
 
-/* building on Solaris platform */
-#undef _SOLARIS
+/* building on Solaris2 platform */
+#undef _SOLARIS2
 
 /* Define to the necessary symbol if this constant
                            uses a non-standard name on your system. */
diff --git a/configure.in b/configure.in
index 1737f95..69db52e 100644
--- a/configure.in
+++ b/configure.in
@@ -135,7 +135,7 @@ case "$target" in
     # It's easier to do this here, rather than AC_CHECK_LIBS for all of the
     # things that are/might be in libsocket or libnsl...
     AC_MSG_RESULT(Solaris 2.x)
-    AC_DEFINE(_SOLARIS,,[building on Solaris platform])
+    AC_DEFINE(_SOLARIS2,,[building on Solaris2 platform])
     LIBS="$LIBS -lsocket -lnsl"
     ;;
   *)
diff --git a/src/utils.c b/src/utils.c
index a3f9fdb..fd30236 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -32,8 +32,7 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-//+#if defined(__sun__) && defined(__svr4__)	/* Solaris 2.x */
-#ifdef _SOLARIS
+#ifdef _SOLARIS2
 # include <sys/sockio.h>
 #endif