[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 06:54:57 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 6b38eaf405f5c9d5738ccbdddf2e0aa380a3ebcf
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 26 23:55:44 2002 +0000

    	- 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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5bca3b8..1b4250e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-26  Darin Adler  <darin at apple.com>
+
+	- 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:
+
 2002-10-25  Darin Adler  <darin at apple.com>
 
 	- fixed 3038011 -- drop-down menu hierarchy broken at yahoo new acct page
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 5bca3b8..1b4250e 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-26  Darin Adler  <darin at apple.com>
+
+	- 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:
+
 2002-10-25  Darin Adler  <darin at apple.com>
 
 	- fixed 3038011 -- drop-down menu hierarchy broken at yahoo new acct page
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 5bca3b8..1b4250e 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-10-26  Darin Adler  <darin at apple.com>
+
+	- 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:
+
 2002-10-25  Darin Adler  <darin at apple.com>
 
 	- fixed 3038011 -- drop-down menu hierarchy broken at yahoo new acct page
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index 90f3d46..cab1076 100644
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -294,7 +294,8 @@ void Collector::finalCheck()
 }
 #endif
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
+
 int Collector::numInterpreters()
 {
   int count = 0;
@@ -373,4 +374,4 @@ CFSetRef Collector::liveObjectClasses()
   return classes;
 }
 
-#endif
+#endif // APPLE_CHANGES
diff --git a/JavaScriptCore/kjs/collector.h b/JavaScriptCore/kjs/collector.h
index 37a123f..8b0abad 100644
--- a/JavaScriptCore/kjs/collector.h
+++ b/JavaScriptCore/kjs/collector.h
@@ -48,7 +48,7 @@
 #include "types.h"
 #include "interpreter.h"
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
 #if !defined(__OBJC__) && !defined(_COLLECTOR)
 typedef void *CFSetRef;
 #endif
@@ -94,7 +94,7 @@ namespace KJS {
      */
     static bool collecting;
 #endif
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     static int numInterpreters();
     static int numGCNotAllowedObjects();
     static int numReferencedObjects();
diff --git a/JavaScriptCore/kjs/grammar.cpp b/JavaScriptCore/kjs/grammar.cpp
index caf78f9..e865a31 100644
--- a/JavaScriptCore/kjs/grammar.cpp
+++ b/JavaScriptCore/kjs/grammar.cpp
@@ -111,8 +111,7 @@
 /* default values for bison */
 #define YYDEBUG 0
 #define YYMAXDEPTH 0
-#ifdef APPLE_CHANGES
-#else
+#if !APPLE_CHANGES
 #define YYERROR_VERBOSE
 #endif
 #define DBG(l, s, e) { l->setLoc(s.first_line, e.last_line, Parser::sid); } // location
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 3472737..a65b737 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -68,7 +68,7 @@ namespace KJS {
   const double Inf = *(const double*) Inf_Bytes;
 };
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
 static pthread_once_t interpreterLockOnce = PTHREAD_ONCE_INIT;
 static pthread_mutex_t interpreterLock;
 
@@ -685,7 +685,7 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
 {
   // add this interpreter to the global chain
   // as a root set for garbage collection
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   lockInterpreter();
   m_interpreter = interp;
 #endif
@@ -699,11 +699,11 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
     s_hook = next = prev = this;
     globalInit();
   }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   unlockInterpreter();
 #endif
 
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
   m_interpreter = interp;
 #endif
   global = glob;
@@ -846,7 +846,7 @@ void InterpreterImp::clear()
 {
   //fprintf(stderr,"InterpreterImp::clear\n");
   // remove from global chain (see init())
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   lockInterpreter();
 #endif
   next->prev = prev;
@@ -858,7 +858,7 @@ void InterpreterImp::clear()
     s_hook = 0L;
     globalClear();
   }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
   unlockInterpreter();
 #endif
 }
@@ -897,12 +897,12 @@ bool InterpreterImp::checkSyntax(const UString &code)
 
 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();
     return result;
@@ -921,9 +921,9 @@ Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
   if (dbg) {
     bool cont = dbg->sourceParsed(globExec,sid,code,errLine);
     if (!cont)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
       {
-	pthread_mutex_unlock(&interpreterLock);
+	unlockInterpreter();
 	return Completion(Break);
       }
 #else
@@ -935,7 +935,7 @@ Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
   if (!progNode) {
     Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine);
     err.put(globExec,"sid",Number(sid));
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     unlockInterpreter();
 #endif
     return Completion(Throw,err);
@@ -980,8 +980,8 @@ Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
     delete progNode;
   recursion--;
 
-#ifdef APPLE_CHANGES
-    unlockInterpreter();
+#if APPLE_CHANGES
+  unlockInterpreter();
 #endif
   return res;
 }
diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h
index 7bc24c0..cb11f3d 100644
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -23,7 +23,7 @@
 #ifndef _KJS_USTRING_H_
 #define _KJS_USTRING_H_
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
 #include <sys/types.h>
 #ifndef KWQ_UNSIGNED_TYPES_DEFINED
 #define KWQ_UNSIGNED_TYPES_DEFINED

-- 
WebKit Debian packaging

