summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/strings.in.h2
-rw-r--r--lib/time.in.h2
-rw-r--r--lib/wchar.in.h8
4 files changed, 15 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9196064cc..92d700f15 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,10 +9,11 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild count-one-bits extensions strcase strftime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild count-one-bits extensions strcase strftime
AUTOMAKE_OPTIONS = 1.5 gnits
+SUBDIRS =
noinst_HEADERS =
noinst_LIBRARIES =
noinst_LTLIBRARIES =
@@ -194,6 +195,7 @@ wchar.h: wchar.in.h
-e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
diff --git a/lib/strings.in.h b/lib/strings.in.h
index 7344d6008..bd767de15 100644
--- a/lib/strings.in.h
+++ b/lib/strings.in.h
@@ -18,7 +18,9 @@
#ifndef _GL_STRINGS_H
+#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
+#endif
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_STRINGS_H@
diff --git a/lib/time.in.h b/lib/time.in.h
index fea9d40a8..7da429a54 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -16,7 +16,9 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
+#endif
/* Don't get in the way of glibc when it includes time.h merely to
declare a few standard symbols, rather than to declare all the
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index 41584959c..2ba2d842d 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -26,7 +26,9 @@
* the declaration of wcwidth().
*/
+#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
+#endif
#ifdef __need_mbstate_t
/* Special invocation convention inside uClibc header files. */
@@ -63,6 +65,12 @@ extern "C" {
#endif
+/* Define wint_t. (Also done in wctype.in.h.) */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
+#endif
+
+
/* Return the number of screen columns needed for WC. */
#if @GNULIB_WCWIDTH@
# if @REPLACE_WCWIDTH@