2 files changed, 10 insertions, 2 deletions
diff --git a/perl.h b/perl.h
index f54c559816..a82e0b14c5 100644
--- a/perl.h
+++ b/perl.h
@@ -199,7 +199,11 @@
 #endif
 
 #ifndef PERL_UNUSED_DECL
-#  define PERL_UNUSED_DECL __attribute__unused__
+#  ifdef HASATTRIBUTE_UNUSED
+#    define PERL_UNUSED_DECL __attribute__unused__
+#  else
+#    define PERL_UNUSED_DECL
+#  endif
 #endif
  
 /* gcc -Wall:
diff --git a/perlio.h b/perlio.h
index 302228299f..8ff2bff2f4 100644
--- a/perlio.h
+++ b/perlio.h
@@ -210,7 +210,11 @@ PERL_EXPORT_C void PerlIO_clone(pTHX_ PerlInterpreter *proto,
 
 START_EXTERN_C
 #ifndef __attribute__format__
-#  define __attribute__format__(x,y,z) __attribute__((format(x,y,z)))
+#  ifdef HASATTRIBUTE_FORMAT
+#    define __attribute__format__(x,y,z) __attribute__((format(x,y,z)))
+#  else
+#    define __attribute__format__(x,y,z)
+#  endif
 #endif
 #ifndef PerlIO_init
 PERL_EXPORT_C void PerlIO_init(pTHX);