diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:45:59 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:45:59 +0000 |
| commit | e64ba74dd92ec48d9b01ef89d637e1def7d11c55 (patch) | |
| tree | bc6d1d91e9ce0c8882382b4a564951ed55575436 | |
| parent | 87f3e594ae187abc9c501dca858292c06dc5d737 (diff) | |
Merge changes between r22053 and r22063 from /fsf/glibc-2_17-branch.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_17@22064 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/include/features.h | 2 | ||||
| -rw-r--r-- | libc/version.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/include/features.h b/libc/include/features.h index c69fc2da2..b624d36cd 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -356,7 +356,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__ 16 +#define __GLIBC_MINOR__ 17 #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) diff --git a/libc/version.h b/libc/version.h index 57b9ec22c..289177c01 100644 --- a/libc/version.h +++ b/libc/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ -#define RELEASE "development" -#define VERSION "2.16.90" +#define RELEASE "stable" +#define VERSION "2.17" |