From 0afead56516c13c007b99d4b252db064080e2679 Mon Sep 17 00:00:00 2001 From: Xavier Bouchoux Date: Mon, 16 Oct 2023 22:35:15 +0200 Subject: [PATCH] glibc patch: add backwards compatibility for strtol-family functions following suit from b40943e253c079ec3de1b149dd2ef0ccc3da38a4, add a version guard in addition to the ISOC2X check. --- lib/libc/include/generic-glibc/features.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libc/include/generic-glibc/features.h b/lib/libc/include/generic-glibc/features.h index 4ce2687602..1f8a5695fd 100644 --- a/lib/libc/include/generic-glibc/features.h +++ b/lib/libc/include/generic-glibc/features.h @@ -469,6 +469,11 @@ # define __GLIBC_USE_DEPRECATED_SCANF 0 #endif + +/* support for ISO C2X strtol was added in 2.38 + * glibc commit 64924422a99690d147a166b4de3103f3bf3eaf6c + */ +#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2 /* ISO C2X added support for a 0b or 0B prefix on binary constants as inputs to strtol-family functions (base 0 or 2). This macro is used to condition redirection in headers to allow that redirection @@ -479,6 +484,9 @@ #else # define __GLIBC_USE_C2X_STRTOL 0 #endif +#else /* glibc 2.37 or lower */ +# define __GLIBC_USE_C2X_STRTOL 0 +#endif /* Get definitions of __STDC_* predefined macros, if the compiler has not preincluded this header automatically. */