[netperf-dev] netperf2 commit notice r319 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2009-09-14 10:41:06 -0700 (Mon, 14 Sep 2009)
New Revision: 319

Modified:
   trunk/config.h.in
   trunk/configure
   trunk/configure.ac
   trunk/src/net_uuid.c
Log:
check for sysinfo.h to allow conditional inclusion in net_uuid.c for Mac OSX

Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in	2009-09-08 21:32:35 UTC (rev 318)
+++ trunk/config.h.in	2009-09-14 17:41:06 UTC (rev 319)
@@ -382,3 +382,5 @@
 
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
+
+#undef HAVE_SYS_SYSINFO_H

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-09-08 21:32:35 UTC (rev 318)
+++ trunk/configure	2009-09-14 17:41:06 UTC (rev 319)
@@ -4428,7 +4428,8 @@
 
 
 
-for ac_header in arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h
+
+for ac_header in arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-09-08 21:32:35 UTC (rev 318)
+++ trunk/configure.ac	2009-09-14 17:41:06 UTC (rev 319)
@@ -36,7 +36,7 @@
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h])
+AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h limits.h malloc.h netdb.h netinet/in.h signal.h stdlib.h string.h strings.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h unistd.h ifaddrs.h sys/sockio.h sys/sysinfo.h])
 
 # Some platforms require these.  There may be a better way.
 AC_HAVE_LIBRARY(socket)

Modified: trunk/src/net_uuid.c
===================================================================
--- trunk/src/net_uuid.c	2009-09-08 21:32:35 UTC (rev 318)
+++ trunk/src/net_uuid.c	2009-09-14 17:41:06 UTC (rev 319)
@@ -36,11 +36,21 @@
 #ifdef WIN32
 #include <windows.h>
 #else
+
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#if HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #endif
 
+#endif
+
 /* system dependent call to get the current system time. Returned as
    100ns ticks since UUID epoch, but resolution may be less than
    100ns. */