about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-08 21:57:15 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-08 21:57:15 -0500
commite5f484c622fa0163379b7e577d5b289f0a0b49e7 (patch)
tree9166d3e861b636f9567f83a9220c45353d02b87d
parentd5835c26428829fc1e9b1a60c52479313a7d91a5 (diff)
downloadglibc-e5f484c622fa0163379b7e577d5b289f0a0b49e7.tar.gz
glibc-e5f484c622fa0163379b7e577d5b289f0a0b49e7.tar.xz
glibc-e5f484c622fa0163379b7e577d5b289f0a0b49e7.zip
bits/poll2.h needs __BEGIN/__END_DECLS
-rw-r--r--ChangeLog2
-rw-r--r--io/bits/poll2.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b0f269c3f..20358264bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-08  Ulrich Drepper  <drepper@gmail.com>
 
+	* io/bits/poll2.h: Add __BEGIN/__END_DECLS.
+
 	* io/Makefile (headers): Add bits/poll2.h.
 
 2011-01-05  Will Schmidt  <will_schmidt@vnet.ibm.com>
diff --git a/io/bits/poll2.h b/io/bits/poll2.h
index 7a9dd8a30b..182e97baf2 100644
--- a/io/bits/poll2.h
+++ b/io/bits/poll2.h
@@ -22,6 +22,8 @@
 #endif
 
 
+__BEGIN_DECLS
+
 extern int __REDIRECT (__poll_alias, (struct pollfd *__fds, nfds_t __nfds,
 				      int __timeout), poll);
 extern int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
@@ -76,3 +78,5 @@ ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout,
   return __ppoll_alias (__fds, __nfds, __timeout, __ss);
 }
 #endif
+
+__END_DECLS