Corrected Linux port for glibc2

1998-01-30 20:59:22 +00:00
parent 243ce5d741
commit 421dfef68e
10 changed files with 16 additions and 7 deletions
--- a/c/src/exec/libcsupport/src/__times.c
+++ b/c/src/exec/libcsupport/src/__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
--- a/c/src/exec/libcsupport/src/malloc.c
+++ b/c/src/exec/libcsupport/src/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) */
--- 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>
--- 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
--- 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) */
--- 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>
--- a/c/src/libmisc/monitor/mon-symbols.c
+++ b/c/src/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>
--- a/cpukit/libcsupport/src/__times.c
+++ b/cpukit/libcsupport/src/__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
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/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) */
--- a/cpukit/libmisc/monitor/mon-symbols.c
+++ b/cpukit/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>