[netperf-dev] netperf4 commit notice r70 - in trunk: . doc src src/NetPerfDir src/NetServerDir

raj at netperf.org raj at netperf.org
Wed Mar 1 17:37:31 PST 2006


Author: raj
Date: 2006-03-01 17:37:25 -0800 (Wed, 01 Mar 2006)
New Revision: 70

Modified:
   trunk/Makefile.in
   trunk/config.h.in
   trunk/configure
   trunk/configure.ac
   trunk/doc/Makefile.in
   trunk/src/Makefile.in
   trunk/src/NetPerfDir/sources
   trunk/src/NetServerDir/sources
   trunk/src/netperf.h
Log:
More baby steps towards glib and Windows


Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/Makefile.in	2006-03-02 01:37:25 UTC (rev 70)
@@ -113,6 +113,7 @@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 have_libxml2 = @have_libxml2@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@

Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/config.h.in	2006-03-02 01:37:25 UTC (rev 70)
@@ -348,6 +348,9 @@
 /* Define to one to include XTI tests. */
 #undef WANT_XTI
 
+/* Define to one to use glib instead of direct pthreads */
+#undef WITH_GLIB
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

Modified: trunk/configure
===================================================================
--- trunk/configure	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/configure	2006-03-02 01:37:25 UTC (rev 70)
@@ -463,7 +463,7 @@
 #endif"
 
 ac_config_libobj_dir=src/missing
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS have_libxml2 NETSYS_SOURCE LIBOJBS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS have_libxml2 have_pkg_config NETSYS_SOURCE LIBOJBS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1035,7 +1035,7 @@
   --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-histogram   include individual op timing, may affect result
+  --enable-histogram      include individual op timing, may affect result
   --enable-demo   emit interim results during the run. May affect results.
   --enable-unixdomain  include Unix Domain socket tests
   --enable-dlpi  include Unix Domain socket tests
@@ -1054,6 +1054,8 @@
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --with-glib             attempt to use glib's thread abstractionsrather than
+                          direct pthreads
 
 Some influential environment variables:
   CC          C compiler command
@@ -3651,7 +3653,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3654 "configure"' > conftest.$ac_ext
+  echo '#line 3656 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5215,7 +5217,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5218:" \
+echo "$as_me:5220:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6311,11 +6313,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6314: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6316: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6318: \$? = $ac_status" >&5
+   echo "$as_me:6320: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6573,11 +6575,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6578: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6580: \$? = $ac_status" >&5
+   echo "$as_me:6582: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6635,11 +6637,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6638: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6640: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6642: \$? = $ac_status" >&5
+   echo "$as_me:6644: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8887,7 +8889,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8890 "configure"
+#line 8892 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8985,7 +8987,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8988 "configure"
+#line 8990 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11238,11 +11240,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11241: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11243: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11245: \$? = $ac_status" >&5
+   echo "$as_me:11247: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11300,11 +11302,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11303: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11305: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11307: \$? = $ac_status" >&5
+   echo "$as_me:11309: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12685,7 +12687,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12688 "configure"
+#line 12690 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12783,7 +12785,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12786 "configure"
+#line 12788 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13668,11 +13670,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13671: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13673: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13675: \$? = $ac_status" >&5
+   echo "$as_me:13677: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13730,11 +13732,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13733: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13735: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13737: \$? = $ac_status" >&5
+   echo "$as_me:13739: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15871,11 +15873,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15874: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15876: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15878: \$? = $ac_status" >&5
+   echo "$as_me:15880: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16133,11 +16135,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16138: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16140: \$? = $ac_status" >&5
+   echo "$as_me:16142: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16195,11 +16197,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16200: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16202: \$? = $ac_status" >&5
+   echo "$as_me:16204: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18447,7 +18449,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18450 "configure"
+#line 18452 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18545,7 +18547,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18548 "configure"
+#line 18550 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24049,6 +24051,68 @@
    { (exit 1); exit 1; }; }
 fi
 
+
+# Check whether --with-glib or --without-glib was given.
+if test "${with_glib+set}" = set; then
+  withval="$with_glib"
+
+fi;
+
+glib_cflags=""
+glib_libs=""
+
+if test "${with_glib+set}" = set && test "$with_glib" != no; then
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_have_pkg_config+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$have_pkg_config"; then
+  ac_cv_prog_have_pkg_config="$have_pkg_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_pkg_config=""yes""
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config=""no""
+fi
+fi
+have_pkg_config=$ac_cv_prog_have_pkg_config
+if test -n "$have_pkg_config"; then
+  echo "$as_me:$LINENO: result: $have_pkg_config" >&5
+echo "${ECHO_T}$have_pkg_config" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+   if test "x$have_pkg_config"="xyes"; then
+	glib_cflags=`pkg-config --cflags glib-2.0`
+	glib_libs=`pkg-config --libs glib-2.0`
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_GLIB 1
+_ACEOF
+
+else
+	{ { echo "$as_me:$LINENO: error: Cannot find pkg-config and so cannot use glib." >&5
+echo "$as_me: error: Cannot find pkg-config and so cannot use glib." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+fi
+
 # see if we should be enabling histogram support
 
 echo "$as_me:$LINENO: checking whether to include histogram support" >&5
@@ -25468,8 +25532,8 @@
 echo "${ECHO_T}\"$enable_cpuutil\"" >&6
 
 # not sure that this is really the right way to do this...help?
-CFLAGS="$CLFAGS $libxml2_cflags"
-LIBS="$LIBS $libxml2_libs"
+CFLAGS="$CLFAGS $libxml2_cflags $glib_cflags"
+LIBS="$LIBS $libxml2_libs $glib_libs"
 
 
 
@@ -26203,6 +26267,7 @@
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at have_libxml2@,$have_libxml2,;t t
+s, at have_pkg_config@,$have_pkg_config,;t t
 s, at NETSYS_SOURCE@,$NETSYS_SOURCE,;t t
 s, at LIBOJBS@,$LIBOJBS,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/configure.ac	2006-03-02 01:37:25 UTC (rev 70)
@@ -122,12 +122,29 @@
 	AC_MSG_ERROR(Cannot find xml2-config.)
 fi
 
+AC_ARG_WITH(glib,
+	[AS_HELP_STRING([--with-glib],[attempt to use glib's thread abstractionsrather than direct pthreads])])
+
+glib_cflags=""
+glib_libs=""
+
+if test "${with_glib+set}" = set && test "$with_glib" != no; then
+   AC_CHECK_PROG(have_pkg_config, pkg-config, "yes","no")
+   if test "x$have_pkg_config"="xyes"; then
+	glib_cflags=`pkg-config --cflags glib-2.0`
+	glib_libs=`pkg-config --libs glib-2.0`
+	AC_DEFINE([WITH_GLIB],1,[Define to one to use glib instead of direct pthreads])
+else
+	AC_MSG_ERROR(Cannot find pkg-config and so cannot use glib.)
+fi
+fi
+
 # see if we should be enabling histogram support
 
 AC_MSG_CHECKING(whether to include histogram support)
 
 AC_ARG_ENABLE(histogram,
-	[  --enable-histogram   include individual op timing, may affect result ])
+	[AS_HELP_STRING([--enable-histogram],[include individual op timing, may affect result]) ])
 
 case "$enable_histogram" in
 	yes)
@@ -551,8 +568,8 @@
 	AC_MSG_RESULT("$enable_cpuutil")
 
 # not sure that this is really the right way to do this...help?
-CFLAGS="$CLFAGS $libxml2_cflags"
-LIBS="$LIBS $libxml2_libs"
+CFLAGS="$CLFAGS $libxml2_cflags $glib_cflags"
+LIBS="$LIBS $libxml2_libs $glib_libs"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)

Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/doc/Makefile.in	2006-03-02 01:37:25 UTC (rev 70)
@@ -113,6 +113,7 @@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 have_libxml2 = @have_libxml2@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@

Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/src/Makefile.in	2006-03-02 01:37:25 UTC (rev 70)
@@ -115,6 +115,7 @@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 have_libxml2 = @have_libxml2@
+have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@

Modified: trunk/src/NetPerfDir/sources
===================================================================
--- trunk/src/NetPerfDir/sources	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/src/NetPerfDir/sources	2006-03-02 01:37:25 UTC (rev 70)
@@ -17,11 +17,11 @@
 C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DDO_IPV6 -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS
 
 SOURCES= \
-        ..\netcpu_ntperf.c \
 	..\netlib.c \
 	..\netsh.c \
-	..\nettest_bsd.c \
-	..\nettest_ipv6.c \
+	..\netlib_none.c \
+	..\netmsg.c \
+	..\netconfidence.c \
 	inet_ntop.c \
 	..\netperf.c
 

Modified: trunk/src/NetServerDir/sources
===================================================================
--- trunk/src/NetServerDir/sources	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/src/NetServerDir/sources	2006-03-02 01:37:25 UTC (rev 70)
@@ -17,11 +17,11 @@
 C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DDO_IPV6 -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS
 
 SOURCES= \
-        ..\netcpu_ntperf.c \
+        ..\netlib_none.c \
 	..\netlib.c \
 	..\netsh.c \
-	..\nettest_bsd.c \
-	..\nettest_ipv6.c \
+	..\netconfidence.c \
+	..\netmsg.c \
 	inet_ntop.c \
 	..\netserver.c
 

Modified: trunk/src/netperf.h
===================================================================
--- trunk/src/netperf.h	2006-03-01 21:44:22 UTC (rev 69)
+++ trunk/src/netperf.h	2006-03-02 01:37:25 UTC (rev 70)
@@ -45,7 +45,9 @@
 #endif
 
 /* we want to get the definition of uint32_t et al */
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 #ifdef WANT_HISTOGRAM
 #include "netperf_hist.h"



More information about the netperf-dev mailing list