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.19-628-g26ffd5e


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  26ffd5e6c7f110cc439bb054fac9567885ffc197 (commit)
      from  93a6d0820430bfe3d09695a1376c07abf6d2214f (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=26ffd5e6c7f110cc439bb054fac9567885ffc197

commit 26ffd5e6c7f110cc439bb054fac9567885ffc197
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Jun 20 20:04:47 2014 -0700

    Clean up HAVE_CONFIG_H and STDC_HEADERS.

diff --git a/ChangeLog b/ChangeLog
index 8998b85..99243fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-20  Roland McGrath  <roland@hack.frob.com>
 
+	* include/libc-symbols.h (HAVE_CONFIG_H, STDC_HEADERS): New macros.
+	* catgets/Makefile (catgets-CPPFLAGS): Remove -DHAVE_CONFIG_H.
+	* locale/Makefile (CPPFLAGS-locale-programs): Likewise.
+	* stdlib/strtol_l.c [_LIBC] (STDC_HEADERS): Don't define it.
+
 	* nptl/allocatestack.c: Include <stack-aliasing.h>.
 	* nptl/stack-aliasing.h: New file.
 	* sysdeps/i386/i686/stack-aliasing.h: New file.
diff --git a/catgets/Makefile b/catgets/Makefile
index 50d972e..4a03eba 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -46,8 +46,7 @@ include ../Rules
 
 $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 
-catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
-	    -DHAVE_CONFIG_H
+catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
 
 CPPFLAGS-gencat = -DNOT_IN_libc
 
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 4b233be..03061ae 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -48,6 +48,19 @@
 
 #include <config.h>
 
+/* Define this for the benefit of portable GNU code that wants to check it.
+   Code that checks with #if will not #include <config.h> again, since we've
+   already done it (and this file is implicitly included in every compile,
+   via -include).  Code that checks with #ifdef will #include <config.h>,
+   but that file should always be idempotent (i.e., it's just #define/#undef
+   and nothing else anywhere should be changing the macro state it touches),
+   so it's harmless.  */
+#define HAVE_CONFIG_H	0
+
+/* Define this for the benefit of portable GNU code that wants to check it.
+   Of course, it's never false when building libc!  */
+#define STDC_HEADERS	1
+
 /* The symbols in all the user (non-_) macros are C symbols.  */
 
 #if !defined HAVE_ASM_WEAK_DIRECTIVE && !defined HAVE_ASM_WEAKEXT_DIRECTIVE
diff --git a/locale/Makefile b/locale/Makefile
index eeff2cb..e4c3878 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -89,7 +89,7 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
 			   -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 			   -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
 			   -DLOCSRCDIR='"$(i18ndir)/locales"' \
-			   -DHAVE_CONFIG_H -DNOT_IN_libc
+			   -DNOT_IN_libc
 
 CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
 CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c
index c77b43d..97351c5 100644
--- a/stdlib/strtol_l.c
+++ b/stdlib/strtol_l.c
@@ -24,7 +24,6 @@
 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING
-# define STDC_HEADERS
 # define HAVE_LIMITS_H
 #endif
 

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

Summary of changes:
 ChangeLog              |    5 +++++
 catgets/Makefile       |    3 +--
 include/libc-symbols.h |   13 +++++++++++++
 locale/Makefile        |    2 +-
 stdlib/strtol_l.c      |    1 -
 5 files changed, 20 insertions(+), 4 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]