diff options
author | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
commit | bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b (patch) | |
tree | 334c4a5d9b11045021021f5f0db53ce4f4fa3ff3 /include | |
parent | 2e76ab2332a7fb9e73a4047625b915bff93bd427 (diff) | |
parent | c4ccff16e2ff92f84102988bd3a32cd1d2719f3a (diff) | |
download | glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.tar glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.tar.gz glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.tar.bz2 glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.zip |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'include')
-rw-r--r-- | include/features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/features.h b/include/features.h index 439f087d8e..23b59aa5ec 100644 --- a/include/features.h +++ b/include/features.h @@ -342,7 +342,7 @@ /* Major and minor version number of the GNU C library package. Use these macros to test for features in specific releases. */ #define __GLIBC__ 2 -#define __GLIBC_MINOR__ 11 +#define __GLIBC_MINOR__ 12 #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) |