projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pipe2: Remove dependency on 'nonblocking' module.
[gnulib.git]
/
lib
/
langinfo.in.h
diff --git
a/lib/langinfo.in.h
b/lib/langinfo.in.h
index
54fa1af
..
8a49512
100644
(file)
--- a/
lib/langinfo.in.h
+++ b/
lib/langinfo.in.h
@@
-1,5
+1,5
@@
/* Substitute for and wrapper around <langinfo.h>.
/* Substitute for and wrapper around <langinfo.h>.
- Copyright (C) 2009
, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2009
-2011
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,6
+25,7
@@
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+@PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_LANGINFO_H@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_LANGINFO_H@
@@
-40,7
+41,10
@@
/* A platform that lacks <langinfo.h>. */
/* Assume that it also lacks <nl_types.h> and the nl_item type. */
/* A platform that lacks <langinfo.h>. */
/* Assume that it also lacks <nl_types.h> and the nl_item type. */
+# if !GNULIB_defined_nl_item
typedef int nl_item;
typedef int nl_item;
+# define GNULIB_defined_nl_item 1
+# endif
/* nl_langinfo items of the LC_CTYPE category */
# define CODESET 10000
/* nl_langinfo items of the LC_CTYPE category */
# define CODESET 10000
@@
-112,6
+116,11
@@
typedef int nl_item;
# define GNULIB_defined_CODESET 1
# endif
# 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
# if !@HAVE_LANGINFO_ERA@
# define ERA 10047
# define ERA_D_FMT 10048
@@
-121,6
+130,12
@@
typedef int nl_item;
# define GNULIB_defined_ERA 1
# endif
# 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. */
#endif
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */