1 files changed, 15 insertions, 3 deletions
diff --git a/dfa.c b/dfa.c
index 88d34d55..54e0ae9d 100644
--- a/dfa.c
+++ b/dfa.c
@@ -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;