2013-06-26 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/stdio.h: Specify std streams always in terms
        of _REENT.
        * libc/include/wchar.h: Ditto.
        * libc/include/sys/reent.h: Remove _RENT_ONLY check around
        setting of _REENT macro.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 46dee570befc98957e445b2ca8e09ec55c3fa7b7..d5b7c7b44f20d59fa27922c46d6e9099870f5eb4 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * libc/include/stdio.h: Specify std streams always in terms
+       of _REENT.
+       * libc/include/wchar.h: Ditto.
+       * libc/include/sys/reent.h: Remove _RENT_ONLY check around
+       setting of _REENT macro.
+
 2013-06-24  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
        * libc/include/string.h (rawmemchr): Declare.

diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 534719aff52983fbd999617c77936ab1a927f75e..504e671b0b96a1a3aea7c043b803eb6782adabc3 100644 (file)
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -139,15 +139,9 @@ typedef _fpos64_t fpos64_t;
 
 #define        TMP_MAX         26
 
-#ifndef _REENT_ONLY
 #define        stdin   (_REENT->_stdin)
 #define        stdout  (_REENT->_stdout)
 #define        stderr  (_REENT->_stderr)
-#else /* _REENT_ONLY */
-#define        stdin   (_impure_ptr->_stdin)
-#define        stdout  (_impure_ptr->_stdout)
-#define        stderr  (_impure_ptr->_stderr)
-#endif /* _REENT_ONLY */
 
 #define _stdin_r(x)    ((x)->_stdin)
 #define _stdout_r(x)   ((x)->_stdout)

diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index d65417341b34015527b46feb9874f71d3ab2fddf..ed01326a3c199f9be9e5808dfa5c063ac832a650 100644 (file)
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -763,8 +763,6 @@ void _reclaim_reent _PARAMS ((struct _reent *));
 
 /* #define _REENT_ONLY define this to get only reentrant routines */
 
-#ifndef _REENT_ONLY
-
 #if defined(__DYNAMIC_REENT__) && !defined(__SINGLE_THREAD__)
 #ifndef __getreent
   struct _reent * _EXFUN(__getreent, (void));
@@ -774,8 +772,6 @@ void _reclaim_reent _PARAMS ((struct _reent *));
 # define _REENT _impure_ptr
 #endif /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
 
-#endif /* !_REENT_ONLY */
-
 #define _GLOBAL_REENT _global_impure_ptr
 
 #ifdef _REENT_GLOBAL_ATEXIT

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index f9e623774a429470b944a40f594db2d6714adc21..5707ddcd3d886b60c96a962c10a6531481617282 100644 (file)
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -179,13 +179,8 @@ int        _EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...));
 
 #define getwc(fp)      fgetwc(fp)
 #define putwc(wc,fp)   fputwc((wc), (fp))
-#ifndef _REENT_ONLY
 #define getwchar()     fgetwc(_REENT->_stdin)
 #define putwchar(wc)   fputwc((wc), _REENT->_stdout)
-#else
-#define getwchar()     fgetwc(_impure_ptr->_stdin)
-#define putwchar(wc)   fputwc((wc), _impure_ptr->_stdout)
-#endif
 
 _END_STD_C