diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-30 12:44:53 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-30 12:45:22 +0000 |
| commit | 847cb13cff14c0d843794b6c2fa88ef80c1e7c7a (patch) | |
| tree | aca40441f35c1fcde116e05779309de2e2b34ea3 /main/talloc/fix-libreplace.patch | |
| parent | 699fab80781e1b543a9a33aaf6141c1f98cf1ddc (diff) | |
| download | aports-847cb13cff14c0d843794b6c2fa88ef80c1e7c7a.tar.bz2 aports-847cb13cff14c0d843794b6c2fa88ef80c1e7c7a.tar.xz | |
main/talloc: upgrade to 2.1.0, and fix musl build
Diffstat (limited to 'main/talloc/fix-libreplace.patch')
| -rw-r--r-- | main/talloc/fix-libreplace.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/main/talloc/fix-libreplace.patch b/main/talloc/fix-libreplace.patch new file mode 100644 index 0000000000..cfe24757ec --- /dev/null +++ b/main/talloc/fix-libreplace.patch @@ -0,0 +1,84 @@ +--- talloc-2.1.0.orig/lib/replace/replace.c ++++ talloc-2.1.0/lib/replace/replace.c +@@ -508,28 +508,6 @@ + # error "You need a strtoll function" + #endif + } +-#else +-#ifdef HAVE_BSD_STRTOLL +-#ifdef HAVE_STRTOQ +-long long int rep_strtoll(const char *str, char **endptr, int base) +-{ +- long long int nb = strtoq(str, endptr, base); +- /* In linux EINVAL is only returned if base is not ok */ +- if (errno == EINVAL) { +- if (base == 0 || (base >1 && base <37)) { +- /* Base was ok so it's because we were not +- * able to make the convertion. +- * Let's reset errno. +- */ +- errno = 0; +- } +- } +- return nb; +-} +-#else +-#error "You need the strtoq function" +-#endif /* HAVE_STRTOQ */ +-#endif /* HAVE_BSD_STRTOLL */ + #endif /* HAVE_STRTOLL */ + + +@@ -546,28 +524,6 @@ + # error "You need a strtoull function" + #endif + } +-#else +-#ifdef HAVE_BSD_STRTOLL +-#ifdef HAVE_STRTOUQ +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base) +-{ +- unsigned long long int nb = strtouq(str, endptr, base); +- /* In linux EINVAL is only returned if base is not ok */ +- if (errno == EINVAL) { +- if (base == 0 || (base >1 && base <37)) { +- /* Base was ok so it's because we were not +- * able to make the convertion. +- * Let's reset errno. +- */ +- errno = 0; +- } +- } +- return nb; +-} +-#else +-#error "You need the strtouq function" +-#endif /* HAVE_STRTOUQ */ +-#endif /* HAVE_BSD_STRTOLL */ + #endif /* HAVE_STRTOULL */ + + #ifndef HAVE_SETENV +--- talloc-2.1.0.orig/lib/replace/replace.h ++++ talloc-2.1.0/lib/replace/replace.h +@@ -355,21 +355,11 @@ + #ifndef HAVE_STRTOLL + #define strtoll rep_strtoll + long long int rep_strtoll(const char *str, char **endptr, int base); +-#else +-#ifdef HAVE_BSD_STRTOLL +-#define strtoll rep_strtoll +-long long int rep_strtoll(const char *str, char **endptr, int base); + #endif +-#endif + + #ifndef HAVE_STRTOULL + #define strtoull rep_strtoull + unsigned long long int rep_strtoull(const char *str, char **endptr, int base); +-#else +-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */ +-#define strtoull rep_strtoull +-unsigned long long int rep_strtoull(const char *str, char **endptr, int base); +-#endif + #endif + + #ifndef HAVE_FTRUNCATE |