summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-05-15 12:29:46 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-05-15 12:29:46 +0000
commit5dc9c96ac5f1141b0c8f4d7ec0b76673e40d645d (patch)
treee49502ef636e5535b005dcbf252bfcb1d7a40477 /c
parent2010-05-15 Chris Johns <chrisj@rtems.org> (diff)
downloadrtems-5dc9c96ac5f1141b0c8f4d7ec0b76673e40d645d.tar.bz2
2010-05-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* startup/syscalls.c: Rename to avoid conflict with newlib.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/arm/gdbarmsim/ChangeLog4
-rw-r--r--c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog b/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog
index 5c7bbe9778..7fb3aca281 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog
+++ b/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * startup/syscalls.c: Rename to avoid conflict with newlib.
+
2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* make/custom/arm920.cfg: Use VFP floating point model.
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c b/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c
index c3effd91ec..0985e0ee81 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c
+++ b/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c
@@ -27,7 +27,7 @@
/* Forward prototypes. */
int _system _PARAMS ((const char *));
int _rename _PARAMS ((const char *, const char *));
-int _isatty _PARAMS ((int));
+int __isatty _PARAMS ((int));
clock_t _times _PARAMS ((struct tms *));
int _gettimeofday _PARAMS ((struct timeval *, void *));
int _unlink _PARAMS ((const char *));
@@ -779,7 +779,7 @@ _times (struct tms * tp)
int
-_isatty (int fd)
+__isatty (int fd)
{
struct fdent *pfd;