Fix gcc warnings on MacOS X.

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 3f4208f1a20408e0856aab620c612e8d939f7528..ff9be005cbd73f4d50fa0b5890fe405ed6f28579 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-27  Bruno Haible  <bruno@clisp.org>
+
+       * dfa.c (parse_bracket_exp_mb): Don't confuse wctype_t with wchar_t.
+
 2005-01-27  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (libgrep_a_DEPENDENCIES): New variable.

diff --git a/gettext-tools/libgrep/dfa.c b/gettext-tools/libgrep/dfa.c
index 23335dcbc43880cb6b0955586b379d2339a6dc6f..cf949f8480a5b62bbf50e67a6b16252a9b64e074 100644 (file)
--- a/gettext-tools/libgrep/dfa.c
+++ b/gettext-tools/libgrep/dfa.c
@@ -458,7 +458,8 @@ parse_bracket_exp_mb ()
 
   work_mbc->nchars = work_mbc->nranges = work_mbc->nch_classes = 0;
   work_mbc->nequivs = work_mbc->ncoll_elems = 0;
-  work_mbc->chars = work_mbc->ch_classes = NULL;
+  work_mbc->chars = NULL;
+  work_mbc->ch_classes = NULL;
   work_mbc->range_sts = work_mbc->range_ends = NULL;
   work_mbc->equivs = work_mbc->coll_elems = NULL;
 
@@ -527,7 +528,7 @@ parse_bracket_exp_mb ()
                  wt = wctype (str);
 
                  if (ch_classes_al == 0)
-                   MALLOC(work_mbc->ch_classes, wchar_t, ++ch_classes_al);
+                   MALLOC(work_mbc->ch_classes, wctype_t, ++ch_classes_al);
                  REALLOC_IF_NECESSARY(work_mbc->ch_classes, wctype_t,
                                       ch_classes_al,
                                       work_mbc->nch_classes + 1);