From a13c3df9fa1ebadb6d2bc784ac2d8348c6e1ac2a Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 30 Sep 2009 06:15:39 +0000
Subject: Rework autoconf defines.

---
 cpukit/libcsupport/src/_calloc_r.c  | 2 +-
 cpukit/libcsupport/src/_realloc_r.c | 2 +-
 cpukit/libcsupport/src/close.c      | 2 +-
 cpukit/libcsupport/src/open.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpukit/libcsupport')

diff --git a/cpukit/libcsupport/src/_calloc_r.c b/cpukit/libcsupport/src/_calloc_r.c
index 5e1b43bb2f..1b515d2464 100644
--- a/cpukit/libcsupport/src/_calloc_r.c
+++ b/cpukit/libcsupport/src/_calloc_r.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#ifdef RTEMS_NEWLIB
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__CALLOC_R)
 #include <sys/reent.h>
 #include <stdlib.h>
 
diff --git a/cpukit/libcsupport/src/_realloc_r.c b/cpukit/libcsupport/src/_realloc_r.c
index 93c2d1bf9d..78c9faf351 100644
--- a/cpukit/libcsupport/src/_realloc_r.c
+++ b/cpukit/libcsupport/src/_realloc_r.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#ifdef RTEMS_NEWLIB
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__REALLOC_R)
 #include <sys/reent.h>
 #include <stdlib.h>
 
diff --git a/cpukit/libcsupport/src/close.c b/cpukit/libcsupport/src/close.c
index a99b852feb..b1ee7ef223 100644
--- a/cpukit/libcsupport/src/close.c
+++ b/cpukit/libcsupport/src/close.c
@@ -44,7 +44,7 @@ int close(
  *  This is the Newlib dependent reentrant version of close().
  */
 
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__CLOSE_R)
 
 #include <reent.h>
 
diff --git a/cpukit/libcsupport/src/open.c b/cpukit/libcsupport/src/open.c
index 39be14a9e3..6b957464f7 100644
--- a/cpukit/libcsupport/src/open.c
+++ b/cpukit/libcsupport/src/open.c
@@ -208,7 +208,7 @@ done:
  *  This is the Newlib dependent reentrant version of open().
  */
 
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE__OPEN_R)
 
 #include <reent.h>
 
-- 
cgit v1.2.3