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

[raj at netperf.org]

Author: raj
Date: 2011-07-12 10:40:29 -0700 (Tue, 12 Jul 2011)
New Revision: 424

Modified:
   trunk/configure
   trunk/configure.ac
   trunk/src/netserver.c
Log:
do not forget an include for WNOHANG

Modified: trunk/configure
===================================================================
--- trunk/configure	2011-07-11 22:01:09 UTC (rev 423)
+++ trunk/configure	2011-07-12 17:40:29 UTC (rev 424)
@@ -4562,7 +4562,7 @@
 done
 
 
-for ac_header in arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h malloc.h netdb.h netinet/in.h netinet/sctp.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h stdlib.h unistd.h
+for ac_header in arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h malloc.h netdb.h netinet/in.h netinet/sctp.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h sys/wait.h stdlib.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-07-11 22:01:09 UTC (rev 423)
+++ trunk/configure.ac	2011-07-12 17:40:29 UTC (rev 424)
@@ -38,7 +38,7 @@
 AC_HEADER_SYS_WAIT
 
 # lets keep this in some semblence of alphabetical order
-AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h malloc.h netdb.h netinet/in.h netinet/sctp.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h stdlib.h unistd.h])
+AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h malloc.h netdb.h netinet/in.h netinet/sctp.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h sys/wait.h stdlib.h unistd.h])
 
 # Some platforms require these.  There may be a better way.
 AC_HAVE_LIBRARY(socket)

Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c	2011-07-11 22:01:09 UTC (rev 423)
+++ trunk/src/netserver.c	2011-07-12 17:40:29 UTC (rev 424)
@@ -107,6 +107,12 @@
 #include <signal.h>
 #endif
 
+#if !defined(HAVE_SETSID)
+#if HAVE_SYS_WAIT_H>
+#include <sys/wait.h>
+#endif
+#endif
+
 #ifdef WIN32
 #include <time.h>
 #include <winsock2.h>