# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1230886689 -3600
# Node ID 7e8a454e9758087dd6c5385b1c22eb2d35abc31a
# Parent  8b11d1d206e0780b166a3011673d5ebc7bfa20b8
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
--- 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
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -50,14 +50,7 @@
 #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
--- a/modules/strftime
+++ b/modules/strftime
@@ -10,6 +10,8 @@
 
 Depends-on:
 extensions
+mbrlen
+mbsinit
 stdbool
 time_r
 wchar