diff options
Diffstat (limited to 'debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch')
| -rw-r--r-- | debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch b/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch deleted file mode 100644 index fb081bb..0000000 --- a/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Vicente Armando Sole <sole@titan.esrf.fr> -Date: Mon, 27 Nov 2017 10:46:30 +0100 -Subject: slocale.h is removed in GLIBC 2.26 - ---- - silx/io/specfile/src/locale_management.c | 24 ++++++++++++++++-------- - 1 file 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> |