[project @ 1997-07-07 15:18:25 by andre]

RS6000 prof/conc patches

diff --git a/ghc/runtime/gum/HLComms.lc b/ghc/runtime/gum/HLComms.lc
index e4dce24..b8a53e7 100644 (file)
--- a/ghc/runtime/gum/HLComms.lc
+++ b/ghc/runtime/gum/HLComms.lc
@@ -11,7 +11,9 @@
 \begin{code}
 #ifdef PAR /* whole file */
 
+#ifndef _AIX
 #define NON_POSIX_SOURCE /* so says Solaris */
+#endif
 
 #include "rtsdefs.h"
 #include "HLC.h"

diff --git a/ghc/runtime/gum/ParInit.lc b/ghc/runtime/gum/ParInit.lc
index 277f500..b961235 100644 (file)
--- a/ghc/runtime/gum/ParInit.lc
+++ b/ghc/runtime/gum/ParInit.lc
@@ -11,7 +11,9 @@
 \begin{code}
 #ifdef PAR /* whole file */
 
+#ifndef _AIX
 #define NON_POSIX_SOURCE /* so says Solaris */
+#endif
 
 #include "rtsdefs.h"
 #include <setjmp.h>

diff --git a/ghc/runtime/main/GranSim.lc b/ghc/runtime/main/GranSim.lc
index b49680f..56346ba 100644 (file)
--- a/ghc/runtime/main/GranSim.lc
+++ b/ghc/runtime/main/GranSim.lc
@@ -20,7 +20,9 @@ which should be <= the length of a word in bits.  -- HWL
 \begin{code}
 #if defined(GRAN) || defined(PAR)
 
+#ifndef _AIX
 #define NON_POSIX_SOURCE    /* gettimeofday */
+#endif
 
 #include "rtsdefs.h" 
 

diff --git a/ghc/runtime/main/Itimer.lc b/ghc/runtime/main/Itimer.lc
index bf845f0..cfd8733 100644 (file)
--- a/ghc/runtime/main/Itimer.lc
+++ b/ghc/runtime/main/Itimer.lc
@@ -24,7 +24,9 @@ to support.  So much for standards.
 
 # include "config.h"
 
+#if !defined(_AIX)
 # define NON_POSIX_SOURCE
+#endif
 
 # include "rtsdefs.h"
 

diff --git a/ghc/runtime/main/Select.lc b/ghc/runtime/main/Select.lc
index 25547e1..c7a31cb 100644 (file)
--- a/ghc/runtime/main/Select.lc
+++ b/ghc/runtime/main/Select.lc
@@ -16,7 +16,10 @@ Handling of select() of read&write on file descriptors or timer expiry.
 /* #define STK_CHK_DEBUG */
 
 #define NULL_REG_MAP
+
+#if !defined(_AIX)
 #define NON_POSIX_SOURCE
+#endif
 /* Should there be a POSIX alternative based on poll()? */
 
 #include "rtsdefs.h"

diff --git a/ghc/runtime/main/Signals.lc b/ghc/runtime/main/Signals.lc
index 74fc6d6..858b407 100644 (file)
--- a/ghc/runtime/main/Signals.lc
+++ b/ghc/runtime/main/Signals.lc
@@ -31,7 +31,7 @@ much pain.
 # define NON_POSIX_SOURCE
 #endif
 
-#if defined(freebsd_TARGET_OS) || defined(aix_TARGET_OS)
+#if defined(freebsd_TARGET_OS) 
 # define NON_POSIX_SOURCE
 #endif
 

diff --git a/ghc/runtime/main/Threads.lc b/ghc/runtime/main/Threads.lc
index ebbed2b..13b3037 100644 (file)
--- a/ghc/runtime/main/Threads.lc
+++ b/ghc/runtime/main/Threads.lc
@@ -26,7 +26,9 @@
 
 #if defined(CONCURRENT) /* the whole module! */
 
+#if !defined(_AIX)
 # define NON_POSIX_SOURCE /* so says Solaris */
+#endif
 
 # include "rtsdefs.h"
 # include <setjmp.h>

diff --git a/ghc/runtime/main/main.lc b/ghc/runtime/main/main.lc
index d8bb331..e4889eb 100644 (file)
--- a/ghc/runtime/main/main.lc
+++ b/ghc/runtime/main/main.lc
@@ -6,8 +6,10 @@
 
 \begin{code}
 #if defined(PROFILING) || defined(PAR) || defined(CONCURRENT)
+#if !defined(_AIX)
 #define NON_POSIX_SOURCE /* time things on Solaris -- sigh */
 #endif
+#endif
 
 #include "rtsdefs.h"
 #include <setjmp.h>

diff --git a/ghc/runtime/storage/SMstats.lc b/ghc/runtime/storage/SMstats.lc
index 9f07b63..0e36474 100644 (file)
--- a/ghc/runtime/storage/SMstats.lc
+++ b/ghc/runtime/storage/SMstats.lc
@@ -13,7 +13,9 @@ stat_exit
 *********************************************************************
 
 \begin{code}
+#if !defined(_AIX)
 #define NON_POSIX_SOURCE /*needed for solaris2 only?*/
+#endif
 
 /* how is this to work given we have not read platform.h yet? */
 #ifdef hpux_TARGET_OS