From 2936b425fd89f68302a0cb6094c8370795668872 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 23 Jan 1998 17:45:05 +0000
Subject: Solaris port updates from Chris Johns

---
 cpukit/libcsupport/src/__gettod.c    |  2 +-
 cpukit/libcsupport/src/error.c       | 12 +++++++-----
 cpukit/libmisc/monitor/mon-symbols.c | 12 ++++++------
 cpukit/score/cpu/unix/cpu.c          | 10 ----------
 4 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c
index b3f091a1b3..cbec1455be 100644
--- a/cpukit/libcsupport/src/__gettod.c
+++ b/cpukit/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/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index 5bd481c3e6..ab4693609e 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/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/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c
index 64a05dee9b..1fed3c47f7 100644
--- a/cpukit/libmisc/monitor/mon-symbols.c
+++ b/cpukit/libmisc/monitor/mon-symbols.c
@@ -11,17 +11,17 @@
  *  $Id$
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/* for strcasecmp in linux */
+/* for strcasecmp in linux and solaris */
 #if defined(linux)
 #define __USE_BSD
 #endif
 #include <string.h>
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <rtems/monitor.h>
 #include <rtems/symbols.h>
 
diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c
index 6fe63f844f..219b81f685 100644
--- a/cpukit/score/cpu/unix/cpu.c
+++ b/cpukit/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
-- 
cgit v1.2.3