strftime: avoid compilation failure on Solaris 2.6

* modules/strftime (Depends-on): Add mbrlen and mbsinit.
* lib/strftime.c [DO_MULTIBYTE]: Include <wchar.h> unconditionally.
Don't #define mbrlen or mbsinit, since now they're guaranteed to
be available.  Reported by Tom G. Christensen.  Details in
<http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/16180>.

diff --git a/ChangeLog b/ChangeLog
index f91c5b3eece53f840b3973a2b0fc2d299db29b1d..b9eb9bc348af7d6bf54e8cc0120212359c2dcab3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2009-01-02  Jim Meyering  <meyering@redhat.com>
+
+       strftime: avoid compilation failure on Solaris 2.6
+       * modules/strftime (Depends-on): Add mbrlen and mbsinit.
+       * lib/strftime.c [DO_MULTIBYTE]: Include <wchar.h> unconditionally.
+       Don't #define mbrlen or mbsinit, since now they're guaranteed to
+       be available.  Reported by Tom G. Christensen.  Details in
+       <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/16180>.
+
 2009-01-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-            Bruno Haible  <bruno@clisp.org>
+           Bruno Haible  <bruno@clisp.org>
 
        Speed up gnulib-tool by doing more string processing through shell
        built-ins.

diff --git a/lib/strftime.c b/lib/strftime.c
index 897aab71e5dd4063b05d955ed5b270077f9add91..3ade8cf77535130ddbc6274332bc552343e3e906 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -50,14 +50,7 @@ extern char *tzname[];
 #define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
 
 #if DO_MULTIBYTE
-# if HAVE_MBRLEN
-#  include <wchar.h>
-# else
-   /* Simulate mbrlen with mblen as best we can.  */
-#  define mbstate_t int
-#  define mbrlen(s, n, ps) mblen (s, n)
-#  define mbsinit(ps) (*(ps) == 0)
-# endif
+# include <wchar.h>
   static const mbstate_t mbstate_zero;
 #endif
 

diff --git a/modules/strftime b/modules/strftime
index cc4545287510937d71017b2fe8696269a6696069..dc53916038b4cf13460f3205fddc764597836161 100644 (file)
--- a/modules/strftime
+++ b/modules/strftime
@@ -10,6 +10,8 @@ m4/strftime.m4
 
 Depends-on:
 extensions
+mbrlen
+mbsinit
 stdbool
 time_r
 wchar