From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 8 Jan 2015 23:38:15 +0000 (-0800)
Subject: Some #include cleanup in aio/timer code.
X-Git-Tag: glibc-2.21~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c97d27f1bb551cb084836463c98be9bb41fd4ae3;p=thirdparty%2Fglibc.git

Some #include cleanup in aio/timer code.
---

diff --git a/ChangeLog b/ChangeLog
index a84c0cbf820..0ad34c309e5 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 7eeff1f1e0f..686328e4aff 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 1770e12f09b..f2d48f9fc49 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.  */