[netperf-dev] netperf2 commit notice r565 - in trunk/src: . NetPerfDir NetServerDir

[raj at netperf.org]

Author: raj
Date: 2012-04-16 11:38:35 -0700 (Mon, 16 Apr 2012)
New Revision: 565

Modified:
   trunk/src/NetPerfDir/sources
   trunk/src/NetServerDir/sources
   trunk/src/netlib.h
Log:
more windows tweaks

Modified: trunk/src/NetPerfDir/sources
===================================================================
--- trunk/src/NetPerfDir/sources	2012-04-04 23:44:21 UTC (rev 564)
+++ trunk/src/NetPerfDir/sources	2012-04-16 18:38:35 UTC (rev 565)
@@ -14,7 +14,7 @@
 
 MSC_WARNING_LEVEL=/W3 /WX
 
-C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DHAVE_STRING_H -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_WS2TCPIP_H -DWANT_OMNI -DHAVE_INTTYPES_H -DWANT_DEMO -DWANT_HISTOGRAM
+C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DHAVE_STRING_H -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_WS2TCPIP_H -DWANT_OMNI -DWANT_DEMO -DWANT_HISTOGRAM
 
 #USER_C_FLAGS=$(USER_C_FLAGS) /E
 

Modified: trunk/src/NetServerDir/sources
===================================================================
--- trunk/src/NetServerDir/sources	2012-04-04 23:44:21 UTC (rev 564)
+++ trunk/src/NetServerDir/sources	2012-04-16 18:38:35 UTC (rev 565)
@@ -14,7 +14,7 @@
 
 MSC_WARNING_LEVEL=/W3 /WX
 
-C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DHAVE_STRING_H -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_WS2TCPIP_H -DWANT_OMNI -DHAVE_INTTYPES_H -DWANT_DEMO -DWANT_HISTOGRAM
+C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DHAVE_STRING_H -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_WS2TCPIP_H -DWANT_OMNI -DWANT_DEMO -DWANT_HISTOGRAM
 
 #USER_C_FLAGS=$(USER_C_FLAGS) /E
 

Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h	2012-04-04 23:44:21 UTC (rev 564)
+++ trunk/src/netlib.h	2012-04-16 18:38:35 UTC (rev 565)
@@ -234,7 +234,11 @@
 #else
 # if HAVE_STDINT_H
 #  include <stdint.h>
+#else
+# ifdef WIN32
+#  include "missing\inttypes.h"
 # endif
+# endif
 #endif
 
 enum sock_buffer{