Skip to content

Improve old glibc versions #19385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Improve old glibc versions #19385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c632164
glibc: move __GLIBC__ version defines to the top of the file
markus-oberhumer Jan 25, 2024
fc72630
glibc: use __GLIBC_USE_DEPRECATED_SCANF for glibc versions < 2.7
markus-oberhumer Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions lib/libc/include/generic-glibc/features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@
# define __KERNEL_STRICT_NAMES
#endif

/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
/* Zig patch: we pass `-D__GLIBC_MINOR__=XX` depending on the target. */

#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

/* Convenience macro to test the version of gcc.
Use like this:
#if __GNUC_PREREQ (2,8)
Expand Down Expand Up @@ -460,7 +468,10 @@
instance, with GCC, -std=gnu11 will have C99-compliant scanf with
or without -D_GNU_SOURCE, but -std=c89 -D_GNU_SOURCE will have the
old extension. */
#if (defined __USE_GNU \
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
/* support for ISOC99 was added in glibc-2.7 */
# define __GLIBC_USE_DEPRECATED_SCANF 1
#elif (defined __USE_GNU \
&& (defined __cplusplus \
? (__cplusplus < 201103L && !defined __GXX_EXPERIMENTAL_CXX0X__) \
: (!defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L)))
Expand Down Expand Up @@ -501,14 +512,6 @@
#undef __GNU_LIBRARY__
#define __GNU_LIBRARY__ 6

/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
/* Zig patch: we pass `-D__GLIBC_MINOR__=XX` depending on the target. */

#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

/* This is here only because every header file already includes this one. */
#ifndef __ASSEMBLER__
# ifndef _SYS_CDEFS_H
Expand Down