[netperf-dev] netperf4 commit notice r45 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2006-01-25 07:57:56 -0800 (Wed, 25 Jan 2006)
New Revision: 45

Modified:
   trunk/src/netlib.c
   trunk/src/netmsg.c
   trunk/src/nettest_bsd.c
   trunk/src/nettest_dns.c
   trunk/src/nettest_vst.c
Log:
Fix compilation issues on MacOS X 4.3.  Needs a bit more work in configure


Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2006-01-25 00:49:18 UTC (rev 44)
+++ trunk/src/netlib.c	2006-01-25 15:57:56 UTC (rev 45)
@@ -36,14 +36,18 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+/* #ifdef HAVE_SYS_UIO_H */
+#include <sys/uio.h>
+/* #endif */
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif

Modified: trunk/src/netmsg.c
===================================================================
--- trunk/src/netmsg.c	2006-01-25 00:49:18 UTC (rev 44)
+++ trunk/src/netmsg.c	2006-01-25 15:57:56 UTC (rev 45)
@@ -32,12 +32,40 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+/* seems that Darwin or at least MacOS X 4.3 needs sys/time with
+   sys/resource */
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
+#endif
+
 #if HAVE_GLIB_H
 #include <glib.h>
 #endif

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2006-01-25 00:49:18 UTC (rev 44)
+++ trunk/src/nettest_bsd.c	2006-01-25 15:57:56 UTC (rev 45)
@@ -72,9 +72,24 @@
 #endif
 
 #include <stdio.h>
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#else
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#endif
+
+#include <float.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+
 #include <errno.h>
 
 #ifdef HAVE_SYS_TIME_H
@@ -84,9 +99,7 @@
 #endif
 #endif
 
-#ifdef OFF
 #include <netinet/in.h>
-#endif
 
 #include <netinet/tcp.h>
 
@@ -97,6 +110,14 @@
 
 #include "nettest_bsd.h"
 
+/* after all that do we have MAXDOUBLE and MINDOUBLE? */
+#ifndef MAXDOUBLE
+#define MAXDOUBLE DBL_MAX
+#endif
+#ifndef MINDOUBLE
+#define MINDOUBLE DBL_MIN
+#endif
+
 #ifdef WIN32
 #define CHECK_FOR_INVALID_SOCKET (temp_socket == INVALID_SOCKET)
 #define CHECK_FOR_RECV_ERROR(len) (len == SOCKET_ERROR)

Modified: trunk/src/nettest_dns.c
===================================================================
--- trunk/src/nettest_dns.c	2006-01-25 00:49:18 UTC (rev 44)
+++ trunk/src/nettest_dns.c	2006-01-25 15:57:56 UTC (rev 45)
@@ -58,8 +58,20 @@
 
 
 #include <stdio.h>
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
 
+/* perhaps this needs ifdef coverage, we use it on darwin to get DLB_MAX et al */
+#include <float.h>
+#ifndef MAXDOUBLE
+#define MAXDOUBLE DBL_MAX
+#endif
+#ifndef MINDOUBLE
+#define MINDOUBLE DBL_MIN
+#endif
+
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME
@@ -87,6 +99,9 @@
 #include <arpa/nameser.h>
 #endif
 
+/* need to get this covered by an ifdef */
+#include <arpa/nameser_compat.h>
+
 #ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif

Modified: trunk/src/nettest_vst.c
===================================================================
--- trunk/src/nettest_vst.c	2006-01-25 00:49:18 UTC (rev 44)
+++ trunk/src/nettest_vst.c	2006-01-25 15:57:56 UTC (rev 45)
@@ -50,7 +50,16 @@
 #endif
 
 #include <stdio.h>
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
+#include <float.h>
+#ifndef MAXDOUBLE
+#define MAXDOUBLE DBL_MAX
+#endif
+#ifndef MINDOUBLE
+#define MINDOUBLE DBL_MIN
+#endif
 #include <unistd.h>
 #include <string.h>
 #include <signal.h>
@@ -63,7 +72,7 @@
 #endif
 #endif
 
-#ifdef OFF
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif