summaryrefslogtreecommitdiffstats
path: root/newlib/libc/include/stdio.h
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2017-06-13 14:51:18 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2017-06-14 10:18:14 -0500
commitc347bb64697a380b749ff073dfa25e35c73c19e7 (patch)
tree25d8e73a2a95914b037284d897fa0957cd5c8f23 /newlib/libc/include/stdio.h
parent0d79b021a4ec4e6b9aa1a9f6db0e29a137005ce7 (diff)
downloadcygnal-c347bb64697a380b749ff073dfa25e35c73c19e7.tar.gz
cygnal-c347bb64697a380b749ff073dfa25e35c73c19e7.tar.bz2
cygnal-c347bb64697a380b749ff073dfa25e35c73c19e7.zip
stdio.h: guard function macros with !__cplusplus
While POSIX allows these functions to also be defined as macros in C, in C++ this is not allowed, and prevents these names (particularly feof) from being used in a custom namespace. Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib/libc/include/stdio.h')
-rw-r--r--newlib/libc/include/stdio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 097b0f665..1c32423d3 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -718,6 +718,7 @@ _ELIDABLE_INLINE int __sputc_r(struct _reent *_ptr, int _c, FILE *_p) {
#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF)))
#define __sfileno(p) ((p)->_file)
+#ifndef __cplusplus
#ifndef _REENT_SMALL
#define feof(p) __sfeof(p)
#define ferror(p) __sferror(p)
@@ -740,6 +741,7 @@ _ELIDABLE_INLINE int __sputc_r(struct _reent *_ptr, int _c, FILE *_p) {
#define putc(x, fp) __sputc_r(_REENT, x, fp)
#endif /* lint */
#endif /* __CYGWIN__ */
+#endif /* __cplusplus */
#if __MISC_VISIBLE
/* fast always-buffered version, true iff error */