X-Git-Url: http://sjero.net/git/?p=iperf;a=blobdiff_plain;f=src%2FLocale.c;fp=src%2FLocale.c;h=d7e71f87439ff260aa8c6af795b0eae8fec6cc13;hp=d6fb1f8b413c7a0bc79432f0490ad43dfc7000a9;hb=0b373e070771aa2bc368ec82dbd4f48e69f5faf9;hpb=160c6a5bab3ab731f5b1ad8bc174e7d087ca7acb

diff --git a/src/Locale.c b/src/Locale.c
index d6fb1f8..d7e71f8 100644
--- a/src/Locale.c
+++ b/src/Locale.c
@@ -55,9 +55,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#ifdef WIN32
-#include "config.win32.h"
-#endif
 #endif
 
 #ifdef __cplusplus
@@ -71,61 +68,6 @@ const char usage_short[] = "\
 Usage: %s [-s|-c host] [options]\n\
 Try `%s --help' for more information.\n";
 
-#ifdef WIN32
-const char usage_long1[] = "\
-Usage: iperf [-s|-c host] [options]\n\
-       iperf [-h|--help] [-v|--version]\n\
-\n\
-Client/Server:\n\
-  -f, --format    [kmKM]   format to report: Kbits, Mbits, KBytes, MBytes\n\
-  -i, --interval  #        seconds between periodic bandwidth reports\n\
-  -l, --len       #[KM]    length of buffer to read or write (default 8 KB)\n\
-  -m, --print_mss          print TCP maximum segment size (MTU - TCP/IP header)\n\
-  -o, --output    <filename> output the report or error message to this specified file\n\
-  -p, --port      #        server port to listen on/connect to\n\
-  -u, --udp                use UDP rather than TCP\n\
-  -w, --window    #[KM]    TCP window size (socket buffer size)\n\
-  -B, --bind      <host>   bind to <host>, an interface or multicast address\n\
-  -C, --compatibility      for use with older versions does not sent extra msgs\n\
-  -M, --mss       #        set TCP maximum segment size (MTU - 40 bytes)\n\
-  -N, --nodelay            set TCP no delay, disabling Nagle's Algorithm\n\
-  -V, --IPv6Version        Set the domain to IPv6\n\
-\n\
-Server specific:\n\
-  -s, --server             run in server mode\n\
-  -U, --single_udp         run in single threaded UDP mode\n\
-  -D, --daemon             run the server as a daemon\n\
-  -R, --remove             remove service in win32\n";
-
-const char usage_long2[] = "\
-\n\
-Client specific:\n\
-  -b, --bandwidth #[KM]    for UDP, bandwidth to send at in bits/sec\n\
-                           (default 1 Mbit/sec, implies -u)\n\
-  -c, --client    <host>   run in client mode, connecting to <host>\n\
-  -d, --dualtest           Do a bidirectional test simultaneously\n\
-  -n, --num       #[KM]    number of bytes to transmit (instead of -t)\n\
-  -r, --tradeoff           Do a bidirectional test individually\n\
-  -t, --time      #        time in seconds to transmit for (default 10 secs)\n\
-  -F, --fileinput <name>   input the data to be transmitted from a file\n\
-  -I, --stdin              input the data to be transmitted from stdin\n\
-  -L, --listenport #       port to recieve bidirectional tests back on\n\
-  -P, --parallel  #        number of parallel client threads to run\n\
-  -T, --ttl       #        time-to-live, for multicast (default 1)\n\
-\n\
-Miscellaneous:\n\
-  -h, --help               print this message and quit\n\
-  -v, --version            print version information and quit\n\
-\n\
-[KM] Indicates options that support a K or M suffix for kilo- or mega-\n\
-\n\
-The TCP window size option can be set by the environment variable\n\
-TCP_WINDOW_SIZE. Most other options can be set by an environment variable\n\
-IPERF_<long option name>, such as IPERF_BANDWIDTH.\n\
-\n\
-Report bugs to <dast@nlanr.net>\n";
-
-#else
 const char usage_long[] = "\
 Usage: iperf [-s|-c host] [options]\n\
        iperf [-h|--help] [-v|--version]\n\
@@ -174,13 +116,10 @@ TCP_WINDOW_SIZE. Most other options can be set by an environment variable\n\
 IPERF_<long option name>, such as IPERF_BANDWIDTH.\n\
 \n\
 Report bugs to <dast@nlanr.net>\n";
-#endif
 
 // include a description of the threading in the version
 #if   defined( HAVE_POSIX_THREAD )
     #define IPERF_THREADS "pthreads"
-#elif defined( HAVE_WIN32_THREAD )
-    #define IPERF_THREADS "win32 threads"
 #else
     #define IPERF_THREADS "single threaded"
 #endif
@@ -299,19 +238,11 @@ const char reportCSV_bw_jitter_loss_format[] =
 "%s,%s,%d,%.1f-%.1f,%lld,%lld,%.3f,%d,%d,%.3f,%d\n";
 #endif // HAVE_PRINTF_QD
 #else // HAVE_QUAD_SUPPORT
-#ifdef WIN32
-const char reportCSV_bw_format[] =
-"%s,%s,%d,%.1f-%.1f,%I64d,%I64d\n";
-
-const char reportCSV_bw_jitter_loss_format[] =
-"%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n";
-#else
 const char reportCSV_bw_format[] =
 "%s,%s,%d,%.1f-%.1f,%d,%d\n";
 
 const char reportCSV_bw_jitter_loss_format[] =
 "%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n";
-#endif //WIN32
 #endif //HAVE_QUAD_SUPPORT
 /* -------------------------------------------------------------------
  * warnings