Rename locale.{c,h} to iperf_locale.{c,h} to avoid filename collision

with system header <locale.h>.

This apparently fixes problems on an ARM build, but this was generally
broken anyway.  It's slightly amazing this didn't cause problems before;
perhaps we never used <locale.h> before?

Addresses #203.
This commit is contained in:
Bruce A. Mah 2014-09-15 10:42:36 -07:00
parent bd9e3ae5bf
commit a1861d5f87
No known key found for this signature in database
GPG Key ID: 4984910A8CAAEE8A
8 changed files with 7 additions and 7 deletions

View File

@ -14,6 +14,8 @@ libiperf_la_SOURCES = \
iperf_api.h \
iperf_error.c \
iperf_client_api.c \
iperf_locale.c \
iperf_locale.h \
iperf_server_api.c \
iperf_tcp.c \
iperf_tcp.h \
@ -23,8 +25,6 @@ libiperf_la_SOURCES = \
iperf_sctp.h \
iperf_util.c \
iperf_util.h \
locale.c \
locale.h \
net.c \
net.h \
queue.h \

View File

@ -58,7 +58,7 @@
#include "units.h"
#include "tcp_window_size.h"
#include "iperf_util.h"
#include "locale.h"
#include "iperf_locale.h"
#include "version.h"
/* Forwards. */

View File

@ -22,7 +22,7 @@
#include "iperf.h"
#include "iperf_api.h"
#include "iperf_util.h"
#include "locale.h"
#include "iperf_locale.h"
#include "net.h"
#include "timer.h"

View File

@ -43,7 +43,7 @@
#include "units.h"
#include "tcp_window_size.h"
#include "iperf_util.h"
#include "locale.h"
#include "iperf_locale.h"
int

View File

@ -31,7 +31,7 @@
#include "iperf.h"
#include "iperf_api.h"
#include "units.h"
#include "locale.h"
#include "iperf_locale.h"
#include "net.h"

View File

@ -37,7 +37,7 @@
#include "iperf.h"
#include "iperf_api.h"
#include "locale.h"
#include "iperf_locale.h"
/*************************************************************/
int