about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-01-08 15:38:15 -0800
committerRoland McGrath <roland@hack.frob.com>2015-01-08 15:38:15 -0800
commitc97d27f1bb551cb084836463c98be9bb41fd4ae3 (patch)
tree68db43a72faa4ef88b3afeeb25e082fcde237c93
parent08734ccd983c4d048ef812d181d5ea9a8860ae45 (diff)
downloadglibc-c97d27f1bb551cb084836463c98be9bb41fd4ae3.tar.gz
glibc-c97d27f1bb551cb084836463c98be9bb41fd4ae3.tar.xz
glibc-c97d27f1bb551cb084836463c98be9bb41fd4ae3.zip
Some #include cleanup in aio/timer code.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/pthread/aio_notify.c1
-rw-r--r--sysdeps/pthread/timer_routines.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a84c0cbf82..0ad34c309e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-08  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/pthread/timer_routines.c: Fix <pthreadP.h> include to use
+	<nptl/pthreadP.h> instead.
+	* sysdeps/pthread/aio_notify.c: Include <signal.h> for raise decl.
+
 	* signal/allocrtsig.c (RESERVED_SIGRT): New macro, defined to 0 if not
 	already defined.
 	[__SIGRTMIN] (init): Function removed.
diff --git a/sysdeps/pthread/aio_notify.c b/sysdeps/pthread/aio_notify.c
index 7eeff1f1e0..686328e4af 100644
--- a/sysdeps/pthread/aio_notify.c
+++ b/sysdeps/pthread/aio_notify.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <aio_misc.h>
+#include <signal.h>
 
 #ifndef aio_start_notify_thread
 # define aio_start_notify_thread() do { } while (0)
diff --git a/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c
index 1770e12f09..f2d48f9fc4 100644
--- a/sysdeps/pthread/timer_routines.c
+++ b/sysdeps/pthread/timer_routines.c
@@ -29,7 +29,7 @@
 #include <sys/syscall.h>
 
 #include "posix-timer.h"
-#include <pthreadP.h>
+#include <nptl/pthreadP.h>
 
 
 /* Number of threads used.  */