| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Fri Aug 31 16:20:03 2007 +0000 (2007-08-31) | |
| changeset 348 | 9fcb5046b4b5 |
| permissions | -rw-r--r-- |
| yann@1 | 1 |
See http://gcc.gnu.org/PR3106 |
| yann@1 | 2 |
Backported from gcc-3.0.x |
| yann@1 | 3 |
|
| yann@1 | 4 |
Fixes error |
| yann@1 | 5 |
.../binutils-2.11.2/libiberty/strerror.c:468: error: conflicting types for `sys_nerr' |
| yann@1 | 6 |
/usr/include/stdio.h:258: error: previous declaration of `sys_nerr' |
| yann@1 | 7 |
make[1]: *** [strerror.o] Error 1 |
| yann@1 | 8 |
make: *** [all-libiberty] Error 2 |
| yann@1 | 9 |
on Mac OS X. |
| yann@1 | 10 |
|
| yann@1 | 11 |
--- gcc-2.95.3/libiberty/strerror.c.old 2004-03-24 16:23:19.000000000 -0800 |
| yann@1 | 12 |
+++ gcc-2.95.3/libiberty/strerror.c 2004-03-24 16:23:48.000000000 -0800 |
| yann@1 | 13 |
@@ -13,6 +13,7 @@ |
| yann@1 | 14 |
incompatible with our later declaration, perhaps by using const |
| yann@1 | 15 |
attributes. So we hide the declaration in errno.h (if any) using a |
| yann@1 | 16 |
macro. */ |
| yann@1 | 17 |
+#define sys_nerr sys_nerr__ |
| yann@1 | 18 |
#define sys_errlist sys_errlist__ |
| yann@1 | 19 |
#endif |
| yann@1 | 20 |
|
| yann@1 | 21 |
@@ -20,6 +21,7 @@ |
| yann@1 | 22 |
#include <errno.h> |
| yann@1 | 23 |
|
| yann@1 | 24 |
#ifdef HAVE_SYS_ERRLIST |
| yann@1 | 25 |
+#undef sys_nerr |
| yann@1 | 26 |
#undef sys_errlist |
| yann@1 | 27 |
#endif |
| yann@1 | 28 |