summaryrefslogtreecommitdiff
path: root/libc/include
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-01-03 21:42:51 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-01-03 21:42:51 +0000
commita2f36c82bede91326449c9144d17f384663c5ab8 (patch)
tree743c2759816fd3eef8f9709d72e538001852db31 /libc/include
parentacd1e4884e92bebf4ca870d510936604f5188e96 (diff)
downloadeglibc2-a2f36c82bede91326449c9144d17f384663c5ab8.tar.gz
Merge changes between r16332 and r16348 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16493 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/include')
-rw-r--r--libc/include/features.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/include/features.h b/libc/include/features.h
index b16129562..f34dc3159 100644
--- a/libc/include/features.h
+++ b/libc/include/features.h
@@ -338,7 +338,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__ 14
+#define __GLIBC_MINOR__ 15
#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))