about summary refs log tree commit diff
path: root/.gitattributes
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2016-03-23 23:35:08 +0100
committerAurelien Jarno <aurelien@aurel32.net>2016-03-23 23:35:08 +0100
commit16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af (patch)
treeff3bb3ed3a4d87dabc606a528c704b1f16a4d426 /.gitattributes
parent7a25d6a84df9fea56963569ceccaaf7c2a88f161 (diff)
downloadglibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.tar.gz
glibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.tar.xz
glibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.zip
Assume __NR_openat is always defined
With the 2.6.32 minimum kernel on x86 and 3.2 on other architectures,
__NR_openat is always defined.

Changelog:
	* sysdeps/unix/sysv/linux/dl-openat64.c (openat64) [__NR_openat]:
	Make code unconditional.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 8947e726a2..06b553db80 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+ChangeLog    merge=merge-changelog
 timezone/* -whitespace