summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hints/darwin.sh13
-rw-r--r--perl.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/hints/darwin.sh b/hints/darwin.sh
index d5e27a593e..b0c317d696 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -81,6 +81,9 @@ ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN"
# cppflags='-traditional-cpp';
# avoid Apple's cpp precompiler, better for extensions
cppflags="${cppflags} -no-cpp-precomp"
+# and ccflags needs them aswell since we don't use cpp directly
+ccflags="${ccflags} -no-cpp-precomp"
+
# Shared library extension is .dylib.
# Bundle extension is .bundle.
@@ -133,9 +136,13 @@ case "$usethreads$useithreads$use5005threads" in
*define*)
cat <<EOM >&4
-*** You do not have threadsafe libraries, I cannot use threads.
-*** Cannot continue, aborting.
+*** Warning, there might be problems with your libraries with
+*** regards to threading.
+
EOM
- exit 1
+#*** You do not have threadsafe libraries, I cannot use threads.
+#*** Cannot continue, aborting.
+#EOM
+# exit 1
;;
esac
diff --git a/perl.h b/perl.h
index 4d9a94edc5..cc451b60fb 100644
--- a/perl.h
+++ b/perl.h
@@ -330,7 +330,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
/* Use the reentrant APIs like localtime_r and getpwent_r */
/* Win32 has naturally threadsafe libraries, no need to use any _r variants. */
-#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(WIN32)
+#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(WIN32) && !defined(__APPLE__)
# define USE_REENTRANT_API
#endif