diff options
| author | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2013-04-28 19:30:52 +0200 |
|---|---|---|
| committer | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2013-04-28 19:30:52 +0200 |
| commit | 11c996c675afa475d46834b2b09039097e25afb5 (patch) | |
| tree | 8e720e41b15affe811b21d74bddba14c302612fa /dfa.c | |
| parent | 74db9f3cb12c4c45487b8646473daad7d0df641f (diff) | |
| parent | 1dd19986291bdd1129ac08eec40d963a65170422 (diff) | |
| download | egawk-11c996c675afa475d46834b2b09039097e25afb5.tar.gz egawk-11c996c675afa475d46834b2b09039097e25afb5.tar.bz2 egawk-11c996c675afa475d46834b2b09039097e25afb5.zip | |
Merge remote-tracking branch 'origin/master' into cmake
Conflicts:
README_d/ChangeLog
Diffstat (limited to 'dfa.c')
| -rw-r--r-- | dfa.c | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,5 @@ /* dfa.c - deterministic extended regexp routines for GNU - Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2012 Free Software + Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2013 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -65,8 +65,8 @@ #include "mbsupport.h" /* defines MBS_SUPPORT to 1 or 0, as appropriate */ #if MBS_SUPPORT /* We can handle multibyte strings. */ -#include <wchar.h> -#include <wctype.h> +# include <wchar.h> +# include <wctype.h> #endif #ifdef GAWK @@ -92,6 +92,14 @@ is_blank (int c) } #endif /* GAWK */ +#ifdef LIBC_IS_BORKED +extern int gawk_mb_cur_max; +#undef MB_CUR_MAX +#define MB_CUR_MAX gawk_mb_cur_max +#undef mbrtowc +#define mbrtowc(a, b, c, d) (-1) +#endif + /* HPUX, define those as macros in sys/param.h */ #ifdef setbit # undef setbit @@ -794,6 +802,10 @@ using_utf8 (void) #else utf8 = 0; #endif +#ifdef LIBC_IS_BORKED + if (gawk_mb_cur_max == 1) + utf8 = 0; +#endif } return utf8; |