- explicitely use _SOLARIS2 macro instead of just _SOLARIS

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. */

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"
     ;;
   *)

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