Changeset 34991 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 3, 2008, 5:06:11 PM (17 years ago)

Author:

[email protected]

Message:

Follow-up to the 64-bit build fix. Use intptr_t rather than ssize_t as the latter is non-standard and does not exist on Windows.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSLock.cpp (modified) (7 diffs)
• kjs/JSLock.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-07-03  Mark Rowe  <[email protected]>
+
+        Follow-up to the 64-bit build fix.  Use intptr_t rather than ssize_t as
+        the latter is non-standard and does not exist on Windows.
+
+        * kjs/JSLock.cpp:
+        (KJS::JSLock::lockCount):
+        (KJS::JSLock::lock):
+        (KJS::JSLock::unlock):
+        (KJS::JSLock::DropAllLocks::DropAllLocks):
+        * kjs/JSLock.h:
+
 2008-07-02  Mark Rowe  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSLock.cpp

@@ -49 +49 @@
 
 // Lock nesting count.
-ssize_t JSLock::lockCount()
-{
-    pthread_once(&createJSLockCountOnce, createJSLockCount);
-
-    return reinterpret_cast<ssize_t>(pthread_getspecific(JSLockCount));
-}
-
-static void setLockCount(ssize_t count)
+intptr_t JSLock::lockCount()
+{
+    pthread_once(&createJSLockCountOnce, createJSLockCount);
+
+    return reinterpret_cast<intptr_t>(pthread_getspecific(JSLockCount));
+}
+
+static void setLockCount(intptr_t count)
 {
     ASSERT(count >= 0);
@@ -80 +80 @@
     pthread_once(&createJSLockCountOnce, createJSLockCount);
 
-    ssize_t currentLockCount = lockCount();
+    intptr_t currentLockCount = lockCount();
     if (!currentLockCount && lockForReal) {
         int result;
@@ -99 +99 @@
 #endif
 
-    ssize_t newLockCount = lockCount() - 1;
+    intptr_t newLockCount = lockCount() - 1;
     setLockCount(newLockCount);
     if (!newLockCount && lockForReal) {
@@ -135 +135 @@
 
     m_lockCount = JSLock::lockCount();
-    for (ssize_t i = 0; i < m_lockCount; i++)
+    for (intptr_t i = 0; i < m_lockCount; i++)
         JSLock::unlock(m_lockingForReal);
 }
@@ -148 +148 @@
 
     m_lockCount = JSLock::lockCount();
-    for (ssize_t i = 0; i < m_lockCount; i++)
+    for (intptr_t i = 0; i < m_lockCount; i++)
         JSLock::unlock(m_lockingForReal);
 }
@@ -154 +154 @@
 JSLock::DropAllLocks::~DropAllLocks()
 {
-    for (ssize_t i = 0; i < m_lockCount; i++)
+    for (intptr_t i = 0; i < m_lockCount; i++)
         JSLock::lock(m_lockingForReal);
 }
@@ -167 +167 @@
 // If threading support is off, set the lock count to a constant value of 1 so assertions
 // that the lock is held don't fail
-ssize_t JSLock::lockCount()
+intptr_t JSLock::lockCount()
 {
     return 1;

trunk/JavaScriptCore/kjs/JSLock.h

@@ -85 +85 @@
         static void unlock(ExecState*);
 
-        static ssize_t lockCount();
+        static intptr_t lockCount();
         static bool currentThreadIsHoldingLock();
 
@@ -99 +99 @@
             
         private:
-            ssize_t m_lockCount;
+            intptr_t m_lockCount;
             bool m_lockingForReal;
         };