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.
Этот коммит содержится в:
родитель
bd9e3ae5bf
Коммит
a1861d5f87
@ -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 \
|
||||
|
@ -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. */
|
||||
|
@ -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"
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
||||
#include "units.h"
|
||||
#include "tcp_window_size.h"
|
||||
#include "iperf_util.h"
|
||||
#include "locale.h"
|
||||
#include "iperf_locale.h"
|
||||
|
||||
|
||||
int
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "iperf.h"
|
||||
#include "iperf_api.h"
|
||||
#include "units.h"
|
||||
#include "locale.h"
|
||||
#include "iperf_locale.h"
|
||||
#include "net.h"
|
||||
|
||||
|
||||
|
@ -37,7 +37,7 @@
|
||||
|
||||
#include "iperf.h"
|
||||
#include "iperf_api.h"
|
||||
#include "locale.h"
|
||||
#include "iperf_locale.h"
|
||||
|
||||
/*************************************************************/
|
||||
int
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user