Fix include paths in include/bits/types/*.h.

Various include/bits/types/*.h files do

where the path specified is relative to the toplevel glibc source
directory.

That has the wrong number of ../ components to achieve the desired
effect; it actually searches relative to include/ for a file that does
not exist there, then goes on to search the #include <> paths
specified with -I, eventually finding the desired file via such a path
(e.g. sysdeps/nptl/) with the right number of directory components.
Before that it searches include/../.. because of the -Iinclude,
meaning that an appropriately named file outside the glibc source tree
can affect the build.

This patch changes all those files to do #include <path> without the
../../, as some such files already do.

Tested for x86_64.

	* include/bits/types/clock_t.h: Use #include <path> instead of
	#include "../../path".
	* include/bits/types/clockid_t.h: Likewise.
	* include/bits/types/struct_iovec.h: Likewise.
	* include/bits/types/struct_itimerspec.h: Likewise.
	* include/bits/types/struct_osockaddr.h: Likewise.
	* include/bits/types/struct_sigstack.h: Likewise.
	* include/bits/types/struct_timespec.h: Likewise.
	* include/bits/types/struct_timeval.h: Likewise.
	* include/bits/types/struct_tm.h: Likewise.
	* include/bits/types/time_t.h: Likewise.
	* include/bits/types/timer_t.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b9c7e28f4c6f9518f0f271f1f9ab26cd0a77286f..e5711559276350a8c958d9c87e64bdac0abd156e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2017-06-07  Joseph Myers  <joseph@codesourcery.com>
 
+       * include/bits/types/clock_t.h: Use #include <path> instead of
+       #include "../../path".
+       * include/bits/types/clockid_t.h: Likewise.
+       * include/bits/types/struct_iovec.h: Likewise.
+       * include/bits/types/struct_itimerspec.h: Likewise.
+       * include/bits/types/struct_osockaddr.h: Likewise.
+       * include/bits/types/struct_sigstack.h: Likewise.
+       * include/bits/types/struct_timespec.h: Likewise.
+       * include/bits/types/struct_timeval.h: Likewise.
+       * include/bits/types/struct_tm.h: Likewise.
+       * include/bits/types/time_t.h: Likewise.
+       * include/bits/types/timer_t.h: Likewise.
+
        [BZ #14096]
        * timezone/Makefile ($(objpfx)tst-timezone.out): Depend on
        America/New_York.

diff --git a/include/bits/types/clock_t.h b/include/bits/types/clock_t.h
index a08940dbefc6c92db15cfdfca4da18ea94419429..4cfe8e7e8b275c2fc4db6256deb853d3e87c0e5a 100644 (file)
--- a/include/bits/types/clock_t.h
+++ b/include/bits/types/clock_t.h
@@ -1 +1 @@
-#include "../../time/bits/types/clock_t.h"
+#include <time/bits/types/clock_t.h>

diff --git a/include/bits/types/clockid_t.h b/include/bits/types/clockid_t.h
index fb0a514446457bbb99435ff52b2760e9fc9cbb05..ff7290bb1dd8c7a3e674ffec9a682bb6075aaafa 100644 (file)
--- a/include/bits/types/clockid_t.h
+++ b/include/bits/types/clockid_t.h
@@ -1 +1 @@
-#include "../../time/bits/types/clockid_t.h"
+#include <time/bits/types/clockid_t.h>

diff --git a/include/bits/types/struct_iovec.h b/include/bits/types/struct_iovec.h
index 116a247ef86aa756625efb8e809c5f3dd70d6547..f8f163f648f8cf33fe3d548165fe618004e8464b 100644 (file)
--- a/include/bits/types/struct_iovec.h
+++ b/include/bits/types/struct_iovec.h
@@ -1 +1 @@
-#include "../../misc/bits/types/struct_iovec.h"
+#include <misc/bits/types/struct_iovec.h>

diff --git a/include/bits/types/struct_itimerspec.h b/include/bits/types/struct_itimerspec.h
index 7d325d6f3c6a259a248a2f9e43a7f88d8b16626b..19a3fa3cb8cf004d599a047f6ea60e03cc9c183b 100644 (file)
--- a/include/bits/types/struct_itimerspec.h
+++ b/include/bits/types/struct_itimerspec.h
@@ -1 +1 @@
-#include "../../time/bits/types/struct_itimerspec.h"
+#include <time/bits/types/struct_itimerspec.h>

diff --git a/include/bits/types/struct_osockaddr.h b/include/bits/types/struct_osockaddr.h
index 78f3188596d815b46e8847e15410fcb28648662c..fe2561bb1f20ccb16ce908ddde9cc3d29cda30d2 100644 (file)
--- a/include/bits/types/struct_osockaddr.h
+++ b/include/bits/types/struct_osockaddr.h
@@ -1 +1 @@
-#include "../../socket/bits/types/struct_osockaddr.h"
+#include <socket/bits/types/struct_osockaddr.h>

diff --git a/include/bits/types/struct_sigstack.h b/include/bits/types/struct_sigstack.h
index 05f1ee55b715489f32783cb14b1a28d20e989fdb..2b23fb2837d379808c2b6f4e08cc9bec35baa5fe 100644 (file)
--- a/include/bits/types/struct_sigstack.h
+++ b/include/bits/types/struct_sigstack.h
@@ -1 +1 @@
-#include "../../signal/bits/types/struct_sigstack.h"
+#include <signal/bits/types/struct_sigstack.h>

diff --git a/include/bits/types/struct_timespec.h b/include/bits/types/struct_timespec.h
index b8ec6a3862076025f3627e49728701f691d6908f..c27417cfd5f299aec6ab3bfe63b4da57f1fe1c38 100644 (file)
--- a/include/bits/types/struct_timespec.h
+++ b/include/bits/types/struct_timespec.h
@@ -1 +1 @@
-#include "../../time/bits/types/struct_timespec.h"
+#include <time/bits/types/struct_timespec.h>

diff --git a/include/bits/types/struct_timeval.h b/include/bits/types/struct_timeval.h
index 5d2cb782598ff186dbdcbfd684fc5ca018283703..a5549cbae37803ab36f5fc6a1572dee4195c1a0d 100644 (file)
--- a/include/bits/types/struct_timeval.h
+++ b/include/bits/types/struct_timeval.h
@@ -1 +1 @@
-#include "../../time/bits/types/struct_timeval.h"
+#include <time/bits/types/struct_timeval.h>

diff --git a/include/bits/types/struct_tm.h b/include/bits/types/struct_tm.h
index b70ac52f68ff7bf03b2f8ad85b6b7b3442ecda5a..412dd8683a59f83cc5e719435778e7b4c61aa400 100644 (file)
--- a/include/bits/types/struct_tm.h
+++ b/include/bits/types/struct_tm.h
@@ -1 +1 @@
-#include "../../time/bits/types/struct_tm.h"
+#include <time/bits/types/struct_tm.h>

diff --git a/include/bits/types/time_t.h b/include/bits/types/time_t.h
index 16e75e19be922f97346b6215f4589e0d2e2179a4..70490c6d052565f52819254de5e87f7ad942aad0 100644 (file)
--- a/include/bits/types/time_t.h
+++ b/include/bits/types/time_t.h
@@ -1 +1 @@
-#include "../../time/bits/types/time_t.h"
+#include <time/bits/types/time_t.h>

diff --git a/include/bits/types/timer_t.h b/include/bits/types/timer_t.h
index e6b279bfcc1a0903cc5c85d4ec98517893aab5a8..5a33fa40a44d4906e3ddcbd8f7b4e1ee52bc0c73 100644 (file)
--- a/include/bits/types/timer_t.h
+++ b/include/bits/types/timer_t.h
@@ -1 +1 @@
-#include "../../time/bits/types/timer_t.h"
+#include <time/bits/types/timer_t.h>