X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fnl_langinfo.c;h=8406ff1912c8d100960c7172eb9ecdc6e84f4435;hb=2aa729ac6af316bc30111144684a51c4650d5c44;hp=74c33c396011c302eb32709c5e0658d9f811a7f4;hpb=fdf6b0ba132b0f8cfacf2ad5d31e366757c7ac34;p=gnulib.git

diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c
index 74c33c396..8406ff191 100644
--- a/lib/nl_langinfo.c
+++ b/lib/nl_langinfo.c
@@ -1,6 +1,6 @@
 /* nl_langinfo() replacement: query locale dependent information.
 
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -67,6 +67,10 @@ rpl_nl_langinfo (nl_item item)
         return "";
       }
 # endif
+# if GNULIB_defined_T_FMT_AMPM
+    case T_FMT_AMPM:
+      return "%I:%M:%S %p";
+# endif
 # if GNULIB_defined_ERA
     case ERA:
       /* The format is not standardized.  In glibc it is a sequence of strings
@@ -93,6 +97,12 @@ rpl_nl_langinfo (nl_item item)
          strings, appended in memory.  */
       return "\0\0\0\0\0\0\0\0\0\0";
 # endif
+# if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS
+    case YESEXPR:
+      return "^[yY]";
+    case NOEXPR:
+      return "^[nN]";
+# endif
     default:
       break;
     }