Some #include cleanup in aio/timer code.

diff --git a/ChangeLog b/ChangeLog
index a84c0cb..0ad34c3 100644 (file)
--- 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 7eeff1f..686328e 100644 (file)
--- 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 1770e12..f2d48f9 100644 (file)
--- 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.  */