Reviewed by Maciej

Compile fix for FreeBSD 5.4 from KDE

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b053c93f1c93e44304b07af8cc94af5b341e7d1c..933fa1c4ba4d04a650578258221818194338d73f 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-22  George Staikos <staikos@opensource.apple.com>
+
+        Reviewed by Maciej.
+
+        * kjs/collector.cpp: merge FreeBSD compile fix from KDE
+                             -> requires build magic for use
+
 2006-01-21  George Staikos <staikos@opensource.apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index c79fe535a1084d2712ab63c046408d4b462ed005..bc06854b6db946e8649c1889e5927db64ee90d74 100644 (file)
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -49,6 +49,12 @@
 
 #include <pthread.h>
 
+#ifdef HAVE_PTHREAD_NP_H
+
+#include <pthread_np.h>
+
+#endif
+
 #endif
 
 using std::max;
@@ -309,8 +315,13 @@ void Collector::markCurrentThreadConservatively()
 #else
     void *stackBase = 0;
     pthread_attr_t sattr;
+#ifdef HAVE_PTHREAD_NP_H
+    // e.g. on FreeBSD 5.4, neundorf@kde.org
+    pthread_attr_get_np(thread, &sattr);
+#else
     // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
     pthread_getattr_np(pthread_self(), &sattr);
+#endif
     // Should work but fails on Linux (?)
     //  pthread_attr_getstack(&sattr, &stackBase, &stackSize);
     pthread_attr_getstackaddr(&sattr, &stackBase);