Changeset 2483 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Oct 26, 2002, 4:55:44 PM (23 years ago)

Author:

darin

Message:

• changed to use #if APPLE_CHANGES and #if !APPLE_CHANGES consistently

We no longer do #ifdef APPLE_CHANGES or #ifndef APPLE_CHANGES.

• kjs/collector.cpp:
• kjs/collector.h:
• kjs/grammar.cpp:
• kjs/internal.cpp:
• kjs/ustring.h:

File:

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

trunk/JavaScriptCore/kjs/internal.cpp

@@ -69 +69 @@
 };
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
 static pthread_once_t interpreterLockOnce = PTHREAD_ONCE_INIT;
 static pthread_mutex_t interpreterLock;
@@ -686 +686 @@
   // add this interpreter to the global chain
   // as a root set for garbage collection
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   lockInterpreter();
   m_interpreter = interp;
@@ -700 +700 @@
     globalInit();
   }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   unlockInterpreter();
 #endif
 
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
   m_interpreter = interp;
 #endif
@@ -847 +847 @@
   //fprintf(stderr,"InterpreterImp::clear\n");
   // remove from global chain (see init())
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   lockInterpreter();
 #endif
@@ -859 +859 @@
     globalClear();
   }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   unlockInterpreter();
 #endif
@@ -898 +898 @@
 Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
 {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   lockInterpreter();
 #endif
   // prevent against infinite recursion
   if (recursion >= 20) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     Completion result = Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
     unlockInterpreter();
@@ -922 +922 @@
     bool cont = dbg->sourceParsed(globExec,sid,code,errLine);
     if (!cont)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
       {
-        pthread_mutex_unlock(&interpreterLock);
+        unlockInterpreter();
         return Completion(Break);
       }
@@ -936 +936 @@
     Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine);
     err.put(globExec,"sid",Number(sid));
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     unlockInterpreter();
 #endif
@@ -981 +981 @@
   recursion--;
 
-#ifdef APPLE_CHANGES
-    unlockInterpreter();
+#if APPLE_CHANGES
+  unlockInterpreter();
 #endif
   return res;