2 files changed, 4 insertions, 3 deletions

diff --git a/lib/fpending.h b/lib/fpending.h
index 4eca3f18e17..306a083e34a 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -24,6 +24,6 @@
 # include <stdio_ext.h>
 #endif
 
-#ifndef __fpending
-size_t __fpending (FILE *);
+#if !HAVE_DECL___FPENDING
+size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE;
 #endif
diff --git a/lib/intprops.h b/lib/intprops.h
index f57f9b4ddab..1d2deb7fc25 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -89,7 +89,8 @@
 
 /* Return 1 if the __typeof__ keyword works.  This could be done by
    'configure', but for now it's easier to do it by hand.  */
-#if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C
+#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+     || (0x5110 <= __SUNPRO_C && !__STDC__))
 # define _GL_HAVE___TYPEOF__ 1
 #else
 # define _GL_HAVE___TYPEOF__ 0