[vlc-devel] [PATCH] contrib: live555: prevent inclusion of xlocale.h on linux

[Filip Roséen]

https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27

Also, as stated in the above notes, xlocale.h was never meant to be
included, so live555 is in the wrong for even trying.

--

I do not know of any LINUX system where xlocale.h is reliably around,
nor do I know of a system where <locale.h> would "not include"
relevant contents from the stated <xlocale.h>.

contrib/.../live555/liveMedia/include/Locale.hh:47:
        #include <xlocale.h> // because, on some systems, <locale.h>
                                doesn't include <xlocale.h>; this makes
                                sure that we get both
---
 contrib/src/live555/rules.mak | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 3093dedec6..fa1868bb15 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -19,9 +19,12 @@ $(TARBALLS)/$(LIVE555_FILE):
 
 .sum-live555: $(LIVE555_FILE)
 
+LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions $(CFLAGS)
+
 LIVE_TARGET = $(error live555 target not defined!)
 ifdef HAVE_LINUX
 LIVE_TARGET := linux
+LIVE_EXTRA_CFLAGS += -DXLOCALE_NOT_USED
 endif
 ifdef HAVE_WIN32
 LIVE_TARGET := mingw
@@ -41,8 +44,6 @@ LIVE_TARGET := solaris-32bit
 endif
 endif
 
-LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions $(CFLAGS)
-
 live555: $(LIVE555_FILE) .sum-live555
 	rm -Rf live && $(UNPACK)
 
-- 
2.18.0