[netperf-dev] netperf2 commit notice r456 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2011-07-27 12:21:23 -0700 (Wed, 27 Jul 2011)
New Revision: 456

Modified:
   trunk/src/netcpu_ntperf.c
   trunk/src/nettest_omni.c
Log:
your left

Modified: trunk/src/netcpu_ntperf.c
===================================================================
--- trunk/src/netcpu_ntperf.c	2011-07-27 18:43:31 UTC (rev 455)
+++ trunk/src/netcpu_ntperf.c	2011-07-27 19:21:23 UTC (rev 456)
@@ -7,14 +7,6 @@
 
 #include <stdio.h>
 
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-
 #include <process.h>
 #include <time.h>
 

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-07-27 18:43:31 UTC (rev 455)
+++ trunk/src/nettest_omni.c	2011-07-27 19:21:23 UTC (rev 456)
@@ -91,7 +91,6 @@
 #include <process.h>
 #define netperf_socklen_t socklen_t
 #include <winsock2.h>
-
 /* while it is unlikely that anyone running Windows 2000 or NT 4 is
    going to be trying to compile this, if they are they will want to
    define DONT_IPV6 in the sources file */
@@ -102,7 +101,7 @@
 
 #define sleep(x) Sleep((x)*1000)
 
-#define __func__ __FUNCTION__
+#include "missing/stdint.h"
 #endif /* WIN32 */
 
 /* We don't want to use bare constants in the shutdown() call.  In the
@@ -272,7 +271,7 @@
     if (sigprocmask(SIG_BLOCK, (sigset_t *)NULL, &signal_set) != 0) { \
       fprintf(where, \
 	      "%s: unable to get sigmask errno %d\n", \
-	      __func__, \
+	      __FUNCTION__, \
 	      errno); \
       fflush(where); \
       exit(1); \
@@ -292,7 +291,7 @@
 	if (sigsuspend(&signal_set) == EFAULT) { \
 	  fprintf(where, \
 		  "%s: fault with sigsuspend.\n", \
-                  __func__); \
+                  __FUNCTION__); \
 	  fflush(where); \
 	  exit(1); \
 	} \
@@ -7917,7 +7916,7 @@
   if (debug) {
     int i;
     printf("%s called with the following argument vector\n",
-	   __func__);
+	   __FUNCTION__);
     for (i = 0; i< argc; i++) {
       printf("%s ",argv[i]);
     }