From f25e45973d5fa161504185626517dfa8abc1a99b Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Fri, 17 Oct 2003 21:43:31 +0000 Subject: [PATCH] * include/stdio.h (_filbuf): Add prototype. (_flsbuf): Add prototype. (getc): Add inline version. (putc): Likewise. (getchar): Likewise. (putchar): Likewise. --- winsup/mingw/ChangeLog | 9 +++++++++ winsup/mingw/include/stdio.h | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 2aa669d36..4d2317936 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,12 @@ +2003-10-17 Danny Smith + + * include/stdio.h (getc): Cast result to unsigned char before + return. + (putc): Likewise + (getchar): Likewise. + (putchar): Likewise. + Thanks to M.Fujii + 2003-10-10 Earnie Boyd * include/_mingw.h: Increment version to 3.2. diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index d923e24c9..8b7b0dd82 100644 --- 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. */