summaryrefslogtreecommitdiffstats
path: root/c/src/exec
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-23 17:45:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-23 17:45:05 +0000
commit2936b425fd89f68302a0cb6094c8370795668872 (patch)
tree48b8c187a4bf8586782a18e8510dad03cf511198 /c/src/exec
parent48971e5ed0ace208018b3adf8807118157b3c40d (diff)
downloadrtems-2936b425fd89f68302a0cb6094c8370795668872.tar.bz2
Solaris port updates from Chris Johns
Diffstat (limited to 'c/src/exec')
-rw-r--r--c/src/exec/libcsupport/src/__gettod.c2
-rw-r--r--c/src/exec/libcsupport/src/error.c12
-rw-r--r--c/src/exec/score/cpu/unix/cpu.c10
-rw-r--r--c/src/exec/wrapup/rtems/Makefile.in2
4 files changed, 9 insertions, 17 deletions
diff --git a/c/src/exec/libcsupport/src/__gettod.c b/c/src/exec/libcsupport/src/__gettod.c
index b3f091a1b3..cbec1455be 100644
--- a/c/src/exec/libcsupport/src/__gettod.c
+++ b/c/src/exec/libcsupport/src/__gettod.c
@@ -20,8 +20,8 @@
#include <sys/reent.h>
#endif
-#include <time.h>
#include <sys/time.h>
+#include <time.h>
#include <errno.h>
#include <assert.h>
diff --git a/c/src/exec/libcsupport/src/error.c b/c/src/exec/libcsupport/src/error.c
index 5bd481c3e6..ab4693609e 100644
--- a/c/src/exec/libcsupport/src/error.c
+++ b/c/src/exec/libcsupport/src/error.c
@@ -142,11 +142,13 @@ static int rtems_verror(
chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
if (local_errno)
- if ((local_errno > 0) && *strerror(local_errno))
- chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
- else
- chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
-
+ {
+ if ((local_errno > 0) && *strerror(local_errno))
+ chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+ else
+ chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+ }
+
chars_written += fprintf(stderr, "\n");
(void) fflush(stderr);
diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c
index 6fe63f844f..219b81f685 100644
--- a/c/src/exec/score/cpu/unix/cpu.c
+++ b/c/src/exec/score/cpu/unix/cpu.c
@@ -14,16 +14,6 @@
#include <rtems/score/isr.h>
#include <rtems/score/interr.h>
-#if defined(solaris2)
-/*
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 3
-#undef __STRICT_ANSI__
-#define __STRICT_ANSI__
-*/
-#define __EXTENSIONS__
-#endif
-
#if defined(__linux__)
#define MALLOC_0_RETURNS_NULL
#endif
diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in
index a00c043c8a..064652c1db 100644
--- a/c/src/exec/wrapup/rtems/Makefile.in
+++ b/c/src/exec/wrapup/rtems/Makefile.in
@@ -45,7 +45,7 @@ CLOBBER_ADDITIONS +=
$(LIB): ${OBJS}
$(make-library)
- cd $(PROJECT_ROOT) ; \
+ -cd $(PROJECT_ROOT) ; \
$(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) \
>$(PROJECT_RELEASE)/lib/sizeinfo.txt