This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.25-421-g81df4d2

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 7 Jun 2017 18:00:06 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.25-421-g81df4d2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  81df4d253dc3184fb003e4737b917e8d35c341d1 (commit)
      from  bd6193907a09f874553886f0986ba16b961fab8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=81df4d253dc3184fb003e4737b917e8d35c341d1

commit 81df4d253dc3184fb003e4737b917e8d35c341d1
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Jun 7 17:59:50 2017 +0000

    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 b9c7e28..e571155 100644
--- 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 a08940d..4cfe8e7 100644
--- 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 fb0a514..ff7290b 100644
--- 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 116a247..f8f163f 100644
--- 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 7d325d6..19a3fa3 100644
--- 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 78f3188..fe2561b 100644
--- 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 05f1ee5..2b23fb2 100644
--- 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 b8ec6a3..c27417c 100644
--- 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 5d2cb78..a5549cb 100644
--- 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 b70ac52..412dd86 100644
--- 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 16e75e1..70490c6 100644
--- 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 e6b279b..5a33fa4 100644
--- 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>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |   13 +++++++++++++
 include/bits/types/clock_t.h           |    2 +-
 include/bits/types/clockid_t.h         |    2 +-
 include/bits/types/struct_iovec.h      |    2 +-
 include/bits/types/struct_itimerspec.h |    2 +-
 include/bits/types/struct_osockaddr.h  |    2 +-
 include/bits/types/struct_sigstack.h   |    2 +-
 include/bits/types/struct_timespec.h   |    2 +-
 include/bits/types/struct_timeval.h    |    2 +-
 include/bits/types/struct_tm.h         |    2 +-
 include/bits/types/time_t.h            |    2 +-
 include/bits/types/timer_t.h           |    2 +-
 12 files changed, 24 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]