Merge branch 'gawk-4.1-stable'

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1abb3e5e..9b4b5f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c (using_simple_locale): Add ifdefs in case there is no
+	locale support at all. Thanks to Scott Deifik for the report.
+
 2014-03-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* .gitignore: Add .dSYM directories for Mac OS X.
diff --git a/dfa.c b/dfa.c
index 8771bbee..813c239b 100644
--- a/dfa.c
+++ b/dfa.c
@@ -820,9 +820,13 @@ using_simple_locale (void)
       static int unibyte_c = -1;
       if (unibyte_c < 0)
         {
+#ifdef LC_ALL
           char *locale = setlocale (LC_ALL, NULL);
           unibyte_c = (locale && (STREQ (locale, "C")
                                   || STREQ (locale, "POSIX")));
+#else
+          unibyte_c = 1;
+#endif
         }
       return unibyte_c;
     }