--- iometer-1.1.0-rc1/src/IOPerformance.h.orig  Mon Nov 29 23:13:41 2010
+++ iometer-1.1.0-rc1/src/IOPerformance.h   Fri Aug 17 18:42:07 2012
@@ -71,6 +71,10 @@
 #ifndef PERFORMANCE_DEFINED
 #define PERFORMANCE_DEFINED

+#if defined(IOMTR_OS_LINUX) || defined(IOMTR_OS_OSX) || defined(IOMTR_OS_SOLARIS)
+#include <net/if.h>
+#endif
+
 #include "IOCommon.h"

 #if defined(IOMTR_OSFAMILY_NETWARE) || defined(IOMTR_OSFAMILY_UNIX)
@@ -93,10 +97,6 @@

 #include <netinet/in.h>

-#if defined(IOMTR_OS_LINUX) || defined(IOMTR_OS_OSX) || defined(IOMTR_OS_SOLARIS)
-#include <net/if.h>
-#endif
-
 #if defined(IOMTR_OS_LINUX) || defined(IOMTR_OSFAMILY_NETWARE) || defined(IOMTR_OS_SOLARIS)
 #include <stropts.h>
 #endif


--- iometer-1.1.0-rc1/src/Makefile-Solaris.i386.orig    Mon Nov 29 23:13:41 2010
+++ iometer-1.1.0-rc1/src/Makefile-Solaris.i386 Fri Aug 17 17:49:01 2012
@@ -88,6 +88,7 @@
    -DIOMTR_CPU_I386 \
         -D_LARGEFILE64_SOURCE \
         -D_REENTRANT \
+        -DNOMINMAX \
    -DUSE_NEW_DISCOVERY_MECHANISM -DFORCE_STRUCT_ALIGN
 #-I/opt/SUNWspro/include/CC \
 # CFLAGS=-compat=4