From a1861d5f87476213d80228a2277941baea8e1156 Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@es.net>
Date: Mon, 15 Sep 2014 10:42:36 -0700
Subject: [PATCH] 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.
---
 src/Makefile.am                  | 4 ++--
 src/iperf_api.c                  | 2 +-
 src/iperf_client_api.c           | 2 +-
 src/{locale.c => iperf_locale.c} | 0
 src/{locale.h => iperf_locale.h} | 0
 src/iperf_server_api.c           | 2 +-
 src/main.c                       | 2 +-
 src/tcp_info.c                   | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{locale.c => iperf_locale.c} (100%)
 rename src/{locale.h => iperf_locale.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index b17f456..07cdfd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \
diff --git a/src/iperf_api.c b/src/iperf_api.c
index 068930f..dc46a53 100644
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -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. */
diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c
index dc0a65e..6780469 100644
--- a/src/iperf_client_api.c
+++ b/src/iperf_client_api.c
@@ -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"
 
diff --git a/src/locale.c b/src/iperf_locale.c
similarity index 100%
rename from src/locale.c
rename to src/iperf_locale.c
diff --git a/src/locale.h b/src/iperf_locale.h
similarity index 100%
rename from src/locale.h
rename to src/iperf_locale.h
diff --git a/src/iperf_server_api.c b/src/iperf_server_api.c
index 8850c93..c698904 100644
--- a/src/iperf_server_api.c
+++ b/src/iperf_server_api.c
@@ -43,7 +43,7 @@
 #include "units.h"
 #include "tcp_window_size.h"
 #include "iperf_util.h"
-#include "locale.h"
+#include "iperf_locale.h"
 
 
 int
diff --git a/src/main.c b/src/main.c
index d4ebf2c..7205cc1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@
 #include "iperf.h"
 #include "iperf_api.h"
 #include "units.h"
-#include "locale.h"
+#include "iperf_locale.h"
 #include "net.h"
 
 
diff --git a/src/tcp_info.c b/src/tcp_info.c
index a0b7ba7..5893904 100644
--- a/src/tcp_info.c
+++ b/src/tcp_info.c
@@ -37,7 +37,7 @@
 
 #include "iperf.h"
 #include "iperf_api.h"
-#include "locale.h"
+#include "iperf_locale.h"
 
 /*************************************************************/
 int