From: Jeff Johnston <jjohnstn@redhat.com>
Date: Wed, 26 Jun 2013 21:34:16 +0000 (+0000)
Subject: 2013-06-26  Jeff Johnston  <jjohnstn@redhat.com>
X-Git-Tag: cygwin-1_7_22-release~70
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=27ad840ea53a4a1c25497d71c2df55f1cf4d25f8;p=newlib-cygwin.git

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 46dee570b..d5b7c7b44 100644
--- 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 534719aff..504e671b0 100644
--- 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 d65417341..ed01326a3 100644
--- 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 f9e623774..5707ddcd3 100644
--- 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