Don't redefine putc and friends on NetBSD.diff -r1.9 -r1.10 pkgsrc/cross/avr-gcc/distinfo
(joerg)
| @@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
| 1 | $NetBSD: distinfo,v 1.9 2014/08/29 04:26:46 mef Exp $ | 1 | $NetBSD: distinfo,v 1.10 2014/09/10 12:11:43 joerg Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (gcc-4.8.3.tar.bz2) = da0a2b9ec074f2bf624a34f3507f812ebb6e4dce | 3 | SHA1 (gcc-4.8.3.tar.bz2) = da0a2b9ec074f2bf624a34f3507f812ebb6e4dce | |
| 4 | RMD160 (gcc-4.8.3.tar.bz2) = 2c7214ff607cbe822282c04d1d6f9fea765c82c5 | 4 | RMD160 (gcc-4.8.3.tar.bz2) = 2c7214ff607cbe822282c04d1d6f9fea765c82c5 | |
| 5 | Size (gcc-4.8.3.tar.bz2) = 86126808 bytes | 5 | Size (gcc-4.8.3.tar.bz2) = 86126808 bytes | |
| 6 | SHA1 (patch-ab) = 4396719b8398cf9eb1f939c447dede250ceb4e26 | 6 | SHA1 (patch-ab) = 4396719b8398cf9eb1f939c447dede250ceb4e26 | |
| 7 | SHA1 (patch-gcc_cp_cfns.h) = d657e8ecde1fc73eebccb4f790f3b266ee2d7a6d | 7 | SHA1 (patch-gcc_cp_cfns.h) = d657e8ecde1fc73eebccb4f790f3b266ee2d7a6d | |
| 8 | SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 |
$NetBSD: patch-gcc_system.h,v 1.1 2014/09/10 12:11:43 joerg Exp $
--- gcc/system.h.orig 2013-04-29 18:37:29.000000000 +0000
+++ gcc/system.h
@@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.
#if defined HAVE_DECL_PUTC_UNLOCKED && HAVE_DECL_PUTC_UNLOCKED
+# if !defined(__NetBSD__)
# ifdef HAVE_PUTC_UNLOCKED
# undef putc
# define putc(C, Stream) putc_unlocked (C, Stream)
# endif
+# endif
# ifdef HAVE_PUTCHAR_UNLOCKED
# undef putchar
# define putchar(C) putchar_unlocked (C)
# endif
+# if !defined(__NetBSD__)
# ifdef HAVE_GETC_UNLOCKED
# undef getc
# define getc(Stream) getc_unlocked (Stream)
# endif
+# endif
# ifdef HAVE_GETCHAR_UNLOCKED
# undef getchar
# define getchar() getchar_unlocked ()