diff options
author | Vicente Armando Sole <sole@titan.esrf.fr> | 2017-11-27 10:46:30 +0100 |
---|---|---|
committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2018-01-21 09:32:38 +0100 |
commit | 3e1deba0bb58f34f7882a840d65de1df6e102549 (patch) | |
tree | 161b703860baf2f5dea5f23d10bca36b2f1f98a2 | |
parent | 5471a02a8ffa0cea16016bdde9fdd050ffba9f67 (diff) |
slocale.h is removed in GLIBC 2.26
Gbp-Pq: Name 0005-slocale.h-is-removed-in-GLIBC-2.26.patch
-rw-r--r-- | silx/io/specfile/src/locale_management.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/silx/io/specfile/src/locale_management.c b/silx/io/specfile/src/locale_management.c index 163ed75..62111cc 100644 --- a/silx/io/specfile/src/locale_management.c +++ b/silx/io/specfile/src/locale_management.c @@ -24,15 +24,23 @@ #include <stdlib.h> #ifdef _GNU_SOURCE -#include <xlocale.h> -#include <locale.h> +# include <locale.h> +# ifdef __GLIBC__ +# include <features.h> +# if !((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ > 25))) +# /* strtod_l has been moved to stdlib.h since glibc 2.26 */ +# include <xlocale.h> +# endif +# else +# include <xlocale.h> +# endif #else -#ifdef PYMCA_POSIX -#else -#ifdef SPECFILE_POSIX -#include <locale.h> -#endif -#endif +# ifdef PYMCA_POSIX +# else +# ifdef SPECFILE_POSIX +# include <locale.h> +# endif +# endif #endif #include <string.h> |