X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlio.h;h=ea7124a76e301a2f7a04536272b9a1d55598d88b;hb=677c8c512628b78c17ac01a6729dda772bef5b0c;hp=f0e735e16b51a33f3ff7f4b4b95a297c4a83f1b4;hpb=de009b76d60bdeb88f1d812ac755ae225805a071;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlio.h b/perlio.h
index f0e735e..ea7124a 100644
--- a/perlio.h
+++ b/perlio.h
@@ -1,7 +1,7 @@
 /*    perlio.h
  *
  *    Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003,
- *    by Larry Wall and others
+ *    2004, 2005, 2006, 2007, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -174,8 +174,6 @@ PERL_EXPORT_C void PerlIO_clone(pTHX_ PerlInterpreter *proto,
 #endif				/* ifndef PERLIO_NOT_STDIO */
 #endif				/* PERLIO_IS_STDIO */
 
-#define specialCopIO(sv) ((sv) == Nullsv)
-
 /* ----------- fill in things that have not got #define'd  ---------- */
 
 #ifndef Fpos_t
@@ -210,19 +208,11 @@ PERL_EXPORT_C void PerlIO_clone(pTHX_ PerlInterpreter *proto,
 
 START_EXTERN_C
 #ifndef __attribute__format__
-#ifdef CHECK_FORMAT
-#define __attribute__format__(x,y,z) __attribute__((__format__(x,y,z)))
-#else
-#define __attribute__format__(x,y,z)
-#endif
-#endif
-#ifndef NEXT30_NO_ATTRIBUTE
-#ifndef HASATTRIBUTE		/* disable GNU-cc attribute checking? */
-#ifdef  __attribute__		/* Avoid possible redefinition errors */
-#undef  __attribute__
-#endif
-#define __attribute__(attr)
-#endif
+#  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);