Fix redefined functions on MacOS X.

This commit is contained in:
Krystian Bacławski
2012-02-17 23:28:32 -08:00
parent c6a3cb1854
commit 0d07b75bf1
@@ -67,3 +67,45 @@
#else /* !__STDC__ */
--- argv.c 2012-02-17 23:18:18.000000000 -0800
+++ /Users/cahir/workspace/m68k-amigaos-toolchain/sources/gcc-2.95.3/libiberty/argv.c 2012-02-17 23:23:39.000000000 -0800
@@ -35,11 +35,13 @@
#ifdef __STDC__
#include <stddef.h>
+#ifndef __APPLE__
extern void *memcpy (void *s1, const void *s2, size_t n); /* 4.11.2.1 */
extern size_t strlen (const char *s); /* 4.11.6.3 */
extern void *malloc (size_t size); /* 4.10.3.3 */
extern void *realloc (void *ptr, size_t size); /* 4.10.3.4 */
extern void free (void *ptr); /* 4.10.3.2 */
+#endif
#else /* !__STDC__ */
--- strerror.c 2012-02-17 23:24:34.000000000 -0800
+++ /Users/cahir/workspace/m68k-amigaos-toolchain/sources/gcc-2.95.3/libiberty/strerror.c 2012-02-17 23:25:04.000000000 -0800
@@ -29,8 +29,10 @@
#ifdef __STDC__
#include <stddef.h>
+#ifndef __APPLE__
extern void *malloc (size_t size); /* 4.10.3.3 */
extern void *memset (void *s, int c, size_t n); /* 4.11.6.1 */
+#endif
#else /* !__STDC__ */
extern char *malloc (); /* Standard memory allocater */
extern char *memset ();
--- strsignal.c 2012-02-17 23:25:29.000000000 -0800
+++ /Users/cahir/workspace/m68k-amigaos-toolchain/sources/gcc-2.95.3/libiberty/strsignal.c 2012-02-17 23:25:44.000000000 -0800
@@ -25,8 +25,10 @@
#ifdef __STDC__
#include <stddef.h>
+#ifndef __APPLE__
extern void *malloc (size_t size); /* 4.10.3.3 */
extern void *memset (void *s, int c, size_t n); /* 4.11.6.1 */
+#endif
#else /* !__STDC__ */
extern char *malloc (); /* Standard memory allocater */
extern char *memset ();