|
 |
25845f |
commit 26ffd5e6c7f110cc439bb054fac9567885ffc197
|
|
|
25845f |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
25845f |
Date: Fri Jun 20 20:04:47 2014 -0700
|
|
|
25845f |
|
|
|
25845f |
Clean up HAVE_CONFIG_H and STDC_HEADERS.
|
|
|
25845f |
|
|
|
25845f |
Conflicts:
|
|
|
25845f |
locale/Makefile
|
|
|
25845f |
|
|
|
25845f |
Due to separate IS_IN backport in glibc-rh1256317-2.patch.
|
|
|
25845f |
|
|
|
25845f |
diff --git a/catgets/Makefile b/catgets/Makefile
|
|
|
25845f |
index 361894a94d6cb740..a1e3e376773de28c 100644
|
|
|
25845f |
--- a/catgets/Makefile
|
|
|
25845f |
+++ b/catgets/Makefile
|
|
|
25845f |
@@ -39,8 +39,7 @@ include ../Rules
|
|
|
25845f |
|
|
|
25845f |
$(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
|
|
|
25845f |
|
|
|
25845f |
-catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
|
|
|
25845f |
- -DHAVE_CONFIG_H
|
|
|
25845f |
+catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
|
|
|
25845f |
|
|
|
25845f |
generated = de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
|
|
|
25845f |
test-gencat.h
|
|
|
25845f |
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
|
|
|
25845f |
index 0f47900922d4099b..bf98c33cf3ba9df6 100644
|
|
|
25845f |
--- a/include/libc-symbols.h
|
|
|
25845f |
+++ b/include/libc-symbols.h
|
|
|
25845f |
@@ -59,6 +59,19 @@
|
|
|
25845f |
|
|
|
25845f |
#include <config.h>
|
|
|
25845f |
|
|
|
25845f |
+/* Define this for the benefit of portable GNU code that wants to check it.
|
|
|
25845f |
+ Code that checks with #if will not #include <config.h> again, since we've
|
|
|
25845f |
+ already done it (and this file is implicitly included in every compile,
|
|
|
25845f |
+ via -include). Code that checks with #ifdef will #include <config.h>,
|
|
|
25845f |
+ but that file should always be idempotent (i.e., it's just #define/#undef
|
|
|
25845f |
+ and nothing else anywhere should be changing the macro state it touches),
|
|
|
25845f |
+ so it's harmless. */
|
|
|
25845f |
+#define HAVE_CONFIG_H 0
|
|
|
25845f |
+
|
|
|
25845f |
+/* Define this for the benefit of portable GNU code that wants to check it.
|
|
|
25845f |
+ Of course, it's never false when building libc! */
|
|
|
25845f |
+#define STDC_HEADERS 1
|
|
|
25845f |
+
|
|
|
25845f |
/* The symbols in all the user (non-_) macros are C symbols. */
|
|
|
25845f |
|
|
|
25845f |
#if !defined HAVE_ASM_WEAK_DIRECTIVE && !defined HAVE_ASM_WEAKEXT_DIRECTIVE
|
|
|
25845f |
diff --git a/locale/Makefile b/locale/Makefile
|
|
|
25845f |
index 2755340dd91bfad6..edd982fe87ca66cb 100644
|
|
|
25845f |
--- a/locale/Makefile
|
|
|
25845f |
+++ b/locale/Makefile
|
|
|
25845f |
@@ -87,8 +87,7 @@ locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
|
|
|
25845f |
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
|
|
|
25845f |
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
|
25845f |
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
|
|
25845f |
- -DLOCSRCDIR='"$(i18ndir)/locales"' \
|
|
|
25845f |
- -DHAVE_CONFIG_H
|
|
|
25845f |
+ -DLOCSRCDIR='"$(i18ndir)/locales"'
|
|
|
25845f |
|
|
|
25845f |
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
|
|
|
25845f |
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
|
|
|
25845f |
diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c
|
|
|
25845f |
index 615190821e24b41a..8174d22f060c2149 100644
|
|
|
25845f |
--- a/stdlib/strtol_l.c
|
|
|
25845f |
+++ b/stdlib/strtol_l.c
|
|
|
25845f |
@@ -25,7 +25,6 @@
|
|
|
25845f |
|
|
|
25845f |
#ifdef _LIBC
|
|
|
25845f |
# define USE_NUMBER_GROUPING
|
|
|
25845f |
-# define STDC_HEADERS
|
|
|
25845f |
# define HAVE_LIMITS_H
|
|
|
25845f |
#endif
|
|
|
25845f |
|