[vlc-commits] nacl: nacl comes with xlocale dummies for C++

[Julian Scheel]

vlc | branch: master | Julian Scheel <julian at jusst.de> | Wed Mar 22 09:58:55 2017 +0100| [c8f8f4a52de1fe7d0b70c3d722019862cde20af7] | committer: Jean-Baptiste Kempf

nacl: nacl comes with xlocale dummies for C++

The nacl c++ toolchain comes with it's own dummy implementation of
extended locale functions, which are not implemented in newlib.
Thus do not use the vlc_fixups ones in C++ code on Native Client builds,
because the dummy implementations will conflict.

Signed-off-by: Julian Scheel <julian at jusst.de>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8f8f4a52de1fe7d0b70c3d722019862cde20af7
---

 include/vlc_fixups.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index df43935..4322647 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -281,6 +281,10 @@ int unsetenv (const char *);
 int posix_memalign (void **, size_t, size_t);
 #endif
 
+#if defined(__native_client__) && defined(__cplusplus)
+# define HAVE_USELOCALE
+#endif
+
 /* locale.h */
 #ifndef HAVE_USELOCALE
 #define LC_ALL_MASK      0