File oce-check-for-xlocale.patch of Package oce
Index: oce-0.18.1/CMakeLists.txt
===================================================================
--- oce-0.18.1.orig/CMakeLists.txt
+++ oce-0.18.1/CMakeLists.txt
@@ -768,6 +768,9 @@ if (NOT CHECK_BODY_TEMPLATE)
set (OCE_IS_DUPLICATE_UINT32_T TRUE)
endif ()
+# Check for presence of xlocale.h and set HAVE_XLOCALE_H accordingly
+check_include_file(xlocale.h HAVE_XLOCALE_H)
+
################################################
# Define output path for generated libraries: #
# platform/compiler-build_type-bits #
Index: oce-0.18.1/src/Standard/Standard_CLocaleSentry.hxx
===================================================================
--- oce-0.18.1.orig/src/Standard/Standard_CLocaleSentry.hxx
+++ oce-0.18.1/src/Standard/Standard_CLocaleSentry.hxx
@@ -20,21 +20,6 @@
#include <locale.h>
-#ifndef HAVE_XLOCALE_H
- //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension
- //! and become part of POSIX since '2008.
- //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
- //! since POSIX didn't declared such identifier.
- #if defined(__APPLE__)
- #define HAVE_XLOCALE_H
- #endif
-
- //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
- #if defined(_GNU_SOURCE) && !defined(__ANDROID__)
- #define HAVE_XLOCALE_H
- #endif
-#endif // ifndef HAVE_LOCALE_H
-
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
#endif