Merged with HEAD from 8/18 or so.

5 files changed, 14 insertions, 13 deletions

diff --git a/pr/include/md/_solaris.h b/pr/include/md/_solaris.h
index 9b92add8..467607ce 100644
--- a/pr/include/md/_solaris.h
+++ b/pr/include/md/_solaris.h
@@ -48,14 +48,8 @@
 #undef _PR_HAVE_ATOMIC_OPS
 #else
 #define _PR_HAVE_ATOMIC_OPS
-/*
- * We have assembly language implementation of atomic
- * stacks for the sparc architecture only.
- */
-#ifdef sparc
 #define _PR_HAVE_ATOMIC_CAS
 #endif
-#endif
 
 #define _PR_POLL_AVAILABLE
 #define _PR_USE_POLL
diff --git a/pr/include/prlog.h b/pr/include/prlog.h
index 50d4aba7..d8e82d51 100644
--- a/pr/include/prlog.h
+++ b/pr/include/prlog.h
@@ -170,6 +170,12 @@ PR_EXTERN(void) PR_LogPrint(const char *fmt, ...);
 */
 PR_EXTERN(void) PR_LogFlush(void);
 
+/* Need external access to this on Mac so we can first set up our faux environment vars */
+#ifdef XP_MAC
+PR_EXTERN(void) PR_Init_Log(void);
+#endif
+
+
 /*
 ** Windoze 16 can't support a large static string space for all of the
 ** various debugging strings so logging is not enabled for it.
diff --git a/pr/src/io/prprf.c b/pr/src/io/prprf.c
index c2c12679..1da92e84 100644
--- a/pr/src/io/prprf.c
+++ b/pr/src/io/prprf.c
@@ -35,7 +35,8 @@
 ** Note: on some platforms va_list is defined as an array,
 ** and requires array notation.
 */
-#if (defined(LINUX) && defined(__powerpc__)) || defined(WIN16) || defined(QNX)
+#if (defined(LINUX) && defined(__powerpc__)) || defined(WIN16) || \
+    defined(QNX) || (defined(__NetBSD__) && defined(__powerpc__))
 #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
 #else
 #define VARARGS_ASSIGN(foo, bar) (foo) = (bar)
diff --git a/pr/tests/attach.c b/pr/tests/attach.c
index 9f59542e..4b890063 100644
--- a/pr/tests/attach.c
+++ b/pr/tests/attach.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 
 #ifdef _PR_PTHREADS
 
-    rv = PTHREAD_ATTR_INIT(&attr);
+    rv = _PT_PTHREAD_ATTR_INIT(&attr);
     if (debug_mode) PR_ASSERT(0 == rv);
 	else if (0 != rv) {
 		failed_already=1;
@@ -228,7 +228,7 @@ int main(int argc, char **argv)
 		goto exit_now;
 	}
 #endif  /* !_PR_DCETHREADS */
-    rv = PTHREAD_CREATE(&threadID, attr, threadStartFunc, NULL);
+    rv = _PT_PTHREAD_CREATE(&threadID, attr, threadStartFunc, NULL);
     if (rv != 0) {
 			fprintf(stderr, "thread creation failed: error code %d\n", rv);
 			failed_already=1;
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
 			printf ("thread creation succeeded \n");
 
 	}
-    rv = PTHREAD_ATTR_DESTROY(&attr);
+    rv = _PT_PTHREAD_ATTR_DESTROY(&attr);
     if (debug_mode) PR_ASSERT(0 == rv);
 	else if (0 != rv) {
 		failed_already=1;
diff --git a/pr/tests/foreign.c b/pr/tests/foreign.c
index efa5a195..11045114 100644
--- a/pr/tests/foreign.c
+++ b/pr/tests/foreign.c
@@ -132,7 +132,7 @@ static PRStatus CreateThread(StartFn start, void *arg)
             start_object->start = start;
             start_object->arg = arg;
 
-            rv = PTHREAD_ATTR_INIT(&tattr);
+            rv = _PT_PTHREAD_ATTR_INIT(&tattr);
             PR_ASSERT(0 == rv);
 
             rv = pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
@@ -143,8 +143,8 @@ static PRStatus CreateThread(StartFn start, void *arg)
             PR_ASSERT(0 == rv);
 #endif
 
-            rv = PTHREAD_CREATE(&id, tattr, pthread_start, start_object);
-            (void)PTHREAD_ATTR_DESTROY(&tattr);
+            rv = _PT_PTHREAD_CREATE(&id, tattr, pthread_start, start_object);
+            (void)_PT_PTHREAD_ATTR_DESTROY(&tattr);
             return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
         }
 #else