Changeset 12296 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 22, 2006, 8:39:36 PM (19 years ago)

Author:

staikos

Message:

Reviewed by Maciej
Compile fix for FreeBSD 5.4 from KDE

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-22  George Staikos <[email protected]>
+
+        Reviewed by Maciej.
+
+        * kjs/collector.cpp: merge FreeBSD compile fix from KDE
+                             -> requires build magic for use
+
 2006-01-21  George Staikos <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -50 +50 @@
 #include <pthread.h>
 
+#ifdef HAVE_PTHREAD_NP_H
+
+#include <pthread_np.h>
+
+#endif
+
 #endif
 
@@ -310 +316 @@
     void *stackBase = 0;
     pthread_attr_t sattr;
+#ifdef HAVE_PTHREAD_NP_H
+    // e.g. on FreeBSD 5.4, [email protected]
+    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);