Mercurial > hg > octave-kai > gnulib-hg

diff lib/strftime.c @ 10990:7e8a454e9758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author Jim Meyering <meyering@redhat.com>
date Fri, 02 Jan 2009 09:58:09 +0100
parents def4f669ceac
children 3da9b6c857c2
line wrap: on
line diff
--- 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