summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-09-30 08:20:32 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-09-30 08:20:32 +0000
commit346725cc9e22b1d8142dbf7ef3765df89b62019c (patch)
tree9d4843667366e0c9b1190a0d936bc031e9172035 /cpukit
parent2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-346725cc9e22b1d8142dbf7ef3765df89b62019c.tar.bz2
Rework autoconf defines.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libcsupport/src/calloc.c2
-rw-r--r--cpukit/libcsupport/src/fcntl.c2
-rw-r--r--cpukit/libcsupport/src/fstat.c2
-rw-r--r--cpukit/libcsupport/src/getpid.c2
-rw-r--r--cpukit/libcsupport/src/isatty_r.c2
-rw-r--r--cpukit/libcsupport/src/issetugid.c2
-rw-r--r--cpukit/libcsupport/src/lseek.c2
-rw-r--r--cpukit/libcsupport/src/read.c2
8 files changed, 9 insertions, 7 deletions
diff --git a/cpukit/libcsupport/src/calloc.c b/cpukit/libcsupport/src/calloc.c
index 4f51210f91..859b4c2213 100644
--- a/cpukit/libcsupport/src/calloc.c
+++ b/cpukit/libcsupport/src/calloc.c
@@ -15,7 +15,7 @@
#include "config.h"
#endif
-#ifdef RTEMS_NEWLIB
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_CALLOC)
#include "malloc_p.h"
#include <stdlib.h>
diff --git a/cpukit/libcsupport/src/fcntl.c b/cpukit/libcsupport/src/fcntl.c
index e40cba59f5..ed99f3dd45 100644
--- a/cpukit/libcsupport/src/fcntl.c
+++ b/cpukit/libcsupport/src/fcntl.c
@@ -172,7 +172,7 @@ int fcntl(
* This is the Newlib dependent reentrant version of fcntl().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_FCNTL_R)
#include <reent.h>
diff --git a/cpukit/libcsupport/src/fstat.c b/cpukit/libcsupport/src/fstat.c
index 360583abfc..86cb4a882d 100644
--- a/cpukit/libcsupport/src/fstat.c
+++ b/cpukit/libcsupport/src/fstat.c
@@ -65,7 +65,7 @@ int fstat(
* This is the Newlib dependent reentrant version of fstat().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_FSTAT_R)
#include <reent.h>
diff --git a/cpukit/libcsupport/src/getpid.c b/cpukit/libcsupport/src/getpid.c
index df47bb3be0..7eb3aacd3d 100644
--- a/cpukit/libcsupport/src/getpid.c
+++ b/cpukit/libcsupport/src/getpid.c
@@ -31,7 +31,7 @@ pid_t getpid( void )
* This is the Newlib dependent reentrant version of getpid().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__GETPID_R)
#include <reent.h>
diff --git a/cpukit/libcsupport/src/isatty_r.c b/cpukit/libcsupport/src/isatty_r.c
index c6c214e2e5..d720d7a927 100644
--- a/cpukit/libcsupport/src/isatty_r.c
+++ b/cpukit/libcsupport/src/isatty_r.c
@@ -19,7 +19,7 @@
* This is the Newlib dependent reentrant version of isatty().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__ISATTY_R)
#include <reent.h>
#include <sys/stat.h>
diff --git a/cpukit/libcsupport/src/issetugid.c b/cpukit/libcsupport/src/issetugid.c
index 09deaaf019..2e10fd208a 100644
--- a/cpukit/libcsupport/src/issetugid.c
+++ b/cpukit/libcsupport/src/issetugid.c
@@ -8,8 +8,10 @@
#include "config.h"
#endif
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_ISSETUGID)
int
issetugid (void)
{
return 0;
}
+#endif
diff --git a/cpukit/libcsupport/src/lseek.c b/cpukit/libcsupport/src/lseek.c
index 3e570e6b18..b2d7af606f 100644
--- a/cpukit/libcsupport/src/lseek.c
+++ b/cpukit/libcsupport/src/lseek.c
@@ -85,7 +85,7 @@ off_t lseek(
* This is the Newlib dependent reentrant version of lseek().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__LSEEK_R)
#include <reent.h>
diff --git a/cpukit/libcsupport/src/read.c b/cpukit/libcsupport/src/read.c
index db8d5fa515..4e44eec4ff 100644
--- a/cpukit/libcsupport/src/read.c
+++ b/cpukit/libcsupport/src/read.c
@@ -55,7 +55,7 @@ ssize_t read(
* This is the Newlib dependent reentrant version of read().
*/
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__READ_R)
#include <reent.h>