Merge branch 'dfsg-orig' into dfsg-debian

[tar] / gnu / langinfo.in.h

diff --git a/gnu/langinfo.in.h b/gnu/langinfo.in.h
index 5a4111127c50254615b07c6bd386b44358bdb18a..95b8d5716d9299ccbcfc3158acfc5cadf2cba842 100644 (file)
--- a/gnu/langinfo.in.h
+++ b/gnu/langinfo.in.h
@@ -27,6 +27,7 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
+@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_LANGINFO_H@
@@ -114,6 +115,11 @@ typedef int nl_item;
 #  define GNULIB_defined_CODESET 1
 # endif
 
+# if !@HAVE_LANGINFO_T_FMT_AMPM@
+#  define T_FMT_AMPM  10006
+#  define GNULIB_defined_T_FMT_AMPM 1
+# endif
+
 # if !@HAVE_LANGINFO_ERA@
 #  define ERA         10047
 #  define ERA_D_FMT   10048
@@ -123,6 +129,12 @@ typedef int nl_item;
 #  define GNULIB_defined_ERA 1
 # endif
 
+# if !@HAVE_LANGINFO_YESEXPR@
+#  define YESEXPR     10053
+#  define NOEXPR      10054
+#  define GNULIB_defined_YESEXPR 1
+# endif
+
 #endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */