Changeset 427 for trunk/JavaScriptCore/kjs/dtoa.cpp

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/kjs/dtoa.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/dtoa.cpp

@@ -169 +169 @@
-namespace KJS {
-
-USE(
+ENABLE(JSC_
-Mutex* s_dtoaP5Mutex;
-#endif
@@ -563 +563 @@
-        return b;
-
-USE(
+ENABLE(JSC_
-    s_dtoaP5Mutex->lock();
-#endif
@@ -573 +573 @@
-    }
-    int p5s_count_local = p5s_count;
-USE(
+ENABLE(JSC_
-    s_dtoaP5Mutex->unlock();
-#endif
@@ -588 +588 @@
-
-        if (++p5s_used == p5s_count_local) {
-USE(
+ENABLE(JSC_
-            s_dtoaP5Mutex->lock();
-#endif
@@ -598 +598 @@
-            
-            p5s_count_local = p5s_count;
-USE(
+ENABLE(JSC_
-            s_dtoaP5Mutex->unlock();
-#endif
@@ -1826 +1826 @@
-}
-
-USE(
+ENABLE(JSC_
-static char* dtoa_result;
-#endif
@@ -1842 +1842 @@
-    *r = k;
-    return
-USE(
+ENABLE(JSC_
-    dtoa_result =
-#endif
@@ -1871 +1871 @@
-    b->maxwds = 1 << (b->k = *(int*)b);
-    Bfree(b);
-USE(
+ENABLE(JSC_
-    if (s == dtoa_result)
-        dtoa_result = 0;
@@ -1937 +1937 @@
-#endif
-
-USE(
+ENABLE(JSC_
-    if (dtoa_result) {
-        freedtoa(dtoa_result);