From a5122e8951bcfa2186786c8504dc098fcaeb9497 Mon Sep 17 00:00:00 2001 From: Jef Poskanzer Date: Fri, 15 Feb 2013 09:10:56 -0800 Subject: [PATCH] Fix a couple problems noted by the C++ compiler. --- src/locale.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/locale.c b/src/locale.c index 12e0247..3c76b9a 100644 --- a/src/locale.c +++ b/src/locale.c @@ -53,6 +53,11 @@ #include "version.h" +#ifdef __cplusplus +extern "C" +{ +#endif + /* ------------------------------------------------------------------- * usage @@ -101,14 +106,14 @@ const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n" #ifdef OBSOLETE /* from old iperf: no longer supported. Add some of these back someday */ - -d, --dualtest Do a bidirectional test simultaneously\n\ - -L, --listenport # port to recieve bidirectional tests back on\n\ - -I, --stdin input the data to be transmitted from stdin\n\ - -F, --fileinput input the data to be transmitted from a file\n\ - -r, --tradeoff Do a bidirectional test individually\n\ - -T, --ttl # time-to-live, for multicast (default 1)\n\ - -x, --reportexclude [CDMSV] exclude C(connection) D(data) M(multicast) S(settings) V(server) reports\n\ - -y, --reportstyle C report as a Comma-Separated Values + "-d, --dualtest Do a bidirectional test simultaneously\n" + "-L, --listenport # port to recieve bidirectional tests back on\n" + "-I, --stdin input the data to be transmitted from stdin\n" + "-F, --fileinput input the data to be transmitted from a file\n" + "-r, --tradeoff Do a bidirectional test individually\n" + "-T, --ttl # time-to-live, for multicast (default 1)\n" + "-x, --reportexclude [CDMSV] exclude C(connection) D(data) M(multicast) S(settings) V(server) reports\n" + "-y, --reportstyle C report as a Comma-Separated Values\n" #endif const char version[] = "iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ")";