From 421dfef68ecd8f424f987d75df3c3080108c5925 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 30 Jan 1998 20:59:22 +0000
Subject: Corrected Linux port for glibc2

---
 c/src/lib/libbsp/unix/posix/startup/bspstart.c | 2 +-
 c/src/lib/libc/__times.c                       | 2 ++
 c/src/lib/libc/malloc.c                        | 2 +-
 c/src/lib/libmisc/monitor/mon-symbols.c        | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'c/src/lib')

diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
index d91d8f95a0..e0b14f91f3 100644
--- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c
+++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 
 /* for sbrk prototype in linux */
-#if defined(linux)
+#if defined(__linux__)
 #define __USE_MISC
 #endif
 #include <unistd.h>
diff --git a/c/src/lib/libc/__times.c b/c/src/lib/libc/__times.c
index d0b96a8657..3a8812a8b3 100644
--- a/c/src/lib/libc/__times.c
+++ b/c/src/lib/libc/__times.c
@@ -63,6 +63,7 @@ clock_t times(
   return _times( ptms );
 }
 
+#if defined(RTEMS_NEWLIB)
 clock_t _times_r(
    struct _reent *ptr,
    struct tms  *ptms
@@ -70,3 +71,4 @@ clock_t _times_r(
 {
   return _times(ptms);
 }
+#endif
diff --git a/c/src/lib/libc/malloc.c b/c/src/lib/libc/malloc.c
index 35acf86a2f..1c0c00b732 100644
--- a/c/src/lib/libc/malloc.c
+++ b/c/src/lib/libc/malloc.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 /* for sbrk prototype in linux */
-#if defined(linux)
+#if defined(__linux__)
 #define __USE_MISC
 #endif
 #include <unistd.h>    /* sbrk(2) */
diff --git a/c/src/lib/libmisc/monitor/mon-symbols.c b/c/src/lib/libmisc/monitor/mon-symbols.c
index 1fed3c47f7..48781bb6cc 100644
--- a/c/src/lib/libmisc/monitor/mon-symbols.c
+++ b/c/src/lib/libmisc/monitor/mon-symbols.c
@@ -12,7 +12,8 @@
  */
 
 /* for strcasecmp in linux and solaris */
-#if defined(linux)
+#if defined(__linux__)
+#include <features.h>
 #define __USE_BSD
 #endif
 #include <string.h>
-- 
cgit v1.2.3