diff options
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/include/stdio.h | 3 | ||||
| -rw-r--r-- | newlib/libc/include/wchar.h | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 146b743f5..ecaed141b 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 Craig Howland <howland@LGSInnovations.com> + + * libc/include/stdio.h (FILE): Protect typedef from redefinition. + * libc/include/wchar.h: Ditto. + 2015-02-25 Gedare Bloom <gedare@rtems.org> * libc/include/machine/time.h (_CLOCKS_PER_SEC_): redefine for RTEMS. diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index e336ee6eb..9d8fd862e 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -49,7 +49,10 @@ _BEGIN_STD_C +#if !defined(__FILE_defined) typedef __FILE FILE; +# define __FILE_defined +#endif #ifdef __CYGWIN__ typedef _fpos64_t fpos_t; diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index d19dae9f8..6c2b8e429 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -49,7 +49,10 @@ _BEGIN_STD_C /* As in stdio.h, <sys/reent.h> defines __FILE. */ +#if !defined(__FILE_defined) typedef __FILE FILE; +# define __FILE_defined +#endif /* As required by POSIX.1-2008, declare tm as incomplete type. The actual definition is in time.h. */ |