Fix compile warnings on DJGPP.

5 files changed, 21 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 044c9e31..84e069ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-14         Eli Zaretskii  <eliz@gnu.org>
+
+	* mbsupport.h (btowc): Change for non-DJGPP.
+	* re.c (dfaerror): Add call to exit for DJGPP.
+
 2012-03-14         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* regex_internal.c (re_string_skip_chars): Fix calculation of
diff --git a/mbsupport.h b/mbsupport.h
index f647d788..80821c6a 100644
--- a/mbsupport.h
+++ b/mbsupport.h
@@ -81,7 +81,9 @@
 #define WEOF		EOF
 #define towupper	toupper
 #define towlower	tolower
-#define btowc(x)	(x)
+#ifndef DJGPP
+#define btowc(x)	((int)x)
+#endif
 #define iswalnum	isalnum
 #define iswalpha	isalpha
 #define iswupper	isupper
diff --git a/pc/ChangeLog b/pc/ChangeLog
index fef06ac5..e921875a 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-14         Eli Zaretskii  <eliz@gnu.org>
+
+	* gawkmisc.pc (btowc): New version for DJGPP.
+
 2012-03-01   Scott Deifik  <scottd.mail@sbcglobal.net>
 
 	* Makefile.tst: Sync with mainline version.
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index 6e5b8bb8..b2a67a50 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -595,4 +595,12 @@ unsetenv (const char *name)
   return putenv (name);
 }
 
+/* This is needed to defeat too-clever GCC warnings in dfa.c about
+   comparison being always false due to limited range of data type.  */
+wint_t
+btowc (int c)
+{
+  return c;
+}
+
 #endif /* __DJGPP__ */
diff --git a/re.c b/re.c
index cec95dac..24522d72 100644
--- a/re.c
+++ b/re.c
@@ -322,6 +322,7 @@ void
 dfaerror(const char *s)
 {
 	fatal("%s", s);
+	exit(EXIT_FATAL);	/* for DJGPP */
 }
 
 /* re_update --- recompile a dynamic regexp */