summaryrefslogtreecommitdiff
path: root/sim/mcore
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>1999-06-28 16:06:02 +0000
committerJason Molenda <jmolenda@apple.com>1999-06-28 16:06:02 +0000
commit085dd6e638eca9d348100c8f0e8cae04e20d58a1 (patch)
tree1e740197cdfedb994222a003ea531ec2febaf173 /sim/mcore
parent303f629d619e7bf37b97c2af6f72aba488669044 (diff)
downloadbinutils-gdb-085dd6e638eca9d348100c8f0e8cae04e20d58a1.tar.gz
import gdb-1999-06-28 snapshot
Diffstat (limited to 'sim/mcore')
-rw-r--r--sim/mcore/ChangeLog5
-rw-r--r--sim/mcore/sysdep.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index f8b9d93c104..7bb8877c38d 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-23 Nick Clifton <nickc@cygnus.com>
+
+ * sysdep.h: Do not define prototypes for memcpy and strchr if they
+ are macros.
+
1999-05-21 Nick Clifton <nickc@cygnus.com>
* interp.c (sim_resume): Add more tracing output.
diff --git a/sim/mcore/sysdep.h b/sim/mcore/sysdep.h
index adf9b5e277f..e2e92e140f1 100644
--- a/sim/mcore/sysdep.h
+++ b/sim/mcore/sysdep.h
@@ -46,7 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/*#include <string.h>*/
#else
extern char * mktemp ();
+#ifndef memset
extern PTR memset ();
+#endif
#ifndef DONTDECLARE_MALLOC
extern PTR malloc ();
@@ -65,7 +67,9 @@ extern void free ();
extern int free();
#endif
+#ifndef strchr
extern char * strchr();
+#endif
extern char * getenv();
extern PTR memchr();
extern char * strrchr();