diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2612b2d35..8a2536d3e 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-11  Jonathan Roelofs  <jonathan@codesourcery.com>
+	    Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/include/stdio.h: Fix type signature of __sfeof and __sferror 
+	for C++.
+
 2014-12-11  Yaakov Selkowitz  <yselkowi@redhat.com>
 
 	* libc/include/stdio_ext.h: Rename __fwriteable to __fwritable.
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index c7d340c5c..620bfbcf2 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -649,8 +649,8 @@ _ELIDABLE_INLINE int __sputc_r(struct _reent *_ptr, int _c, FILE *_p) {
 #endif
 #endif
 
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sfeof(p)	((int)(((p)->_flags & __SEOF) != 0))
+#define	__sferror(p)	((int)(((p)->_flags & __SERR) != 0))
 #define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
 #define	__sfileno(p)	((p)->_file)