* include/stdio.h (_filbuf): Add prototype.

	(_flsbuf): Add prototype.
	(getc): Add inline version.
	(putc): Likewise.
	(getchar): Likewise.
	(putchar): Likewise.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 2aa669d36e0df6a835376ff392afd88a6dcec586..4d23179363a3c5acbb33709fbbd4ac2f6097de8c 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/stdio.h (getc): Cast result to unsigned char before
+       return.
+       (putc): Likewise
+       (getchar): Likewise.
+       (putchar): Likewise.
+       Thanks to M.Fujii  <boochang@m4.kcn.ne.jp>
+
 2003-10-10  Earnie Boyd  <earnie@users.sf.net>
 
        * include/_mingw.h: Increment version to 3.2.

diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index d923e24c96b63f786a7435a6985595a0e12f67d3..8b7b0dd821a1af41487b8637ec4c600bd8cb8d06 100644 (file)
--- a/winsup/mingw/include/stdio.h
+++ b/winsup/mingw/include/stdio.h
@@ -265,28 +265,28 @@ _CRTIMP int __cdecl       _flsbuf (int, FILE*);
 __CRT_INLINE int __cdecl getc (FILE* __F)
 {
   return (--__F->_cnt >= 0)
-    ?  (int) *__F->_ptr++
+    ?  (int) (unsigned char) *__F->_ptr++
     : _filbuf (__F);
 }
 
 __CRT_INLINE int __cdecl putc (int __c, FILE* __F)
 {
   return (--__F->_cnt >= 0)
-    ?  (int)(*__F->_ptr++ = (char)__c)
+    ?  (int) (unsigned char) (*__F->_ptr++ = (char)__c)
     :  _flsbuf (__c, __F);
 }
 
 __CRT_INLINE int __cdecl getchar (void)
 {
   return (--stdin->_cnt >= 0)
-    ?  (int) *stdin->_ptr++
+    ?  (int) (unsigned char) *stdin->_ptr++
     : _filbuf (stdin);
 }
 
 __CRT_INLINE int __cdecl putchar(int __c)
 {
   return (--stdout->_cnt >= 0)
-    ?  (int)(*stdout->_ptr++ = (char)__c)
+    ?  (int) (unsigned char) (*stdout->_ptr++ = (char)__c)
     :  _flsbuf (__c, stdout);}
 
 #else  /* Use library functions.  */