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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:44:53 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1e28d9af7863c7546975f749a8a424b94dd80490
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 26 15:20:47 2002 +0000

    	Fix the infinity problem Dave worked around. We didn't have the
    	configuration flags set right to make infinity work. Setting those
    	properly made everything work without changes to min and max.
    
            * kjs/config.h: Define HAVE_FUNC_ISINF, HAVE_STRING_H, and
    	also WORDS_BIGENDIAN (if on ppc).
    
            * kjs/math_object.cpp: (MathFuncImp::call): Roll out min and max
    	changes from yesterday.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index aa40975..9825fa3 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-26  Darin Adler  <darin at apple.com>
+
+	Fix the infinity problem Dave worked around. We didn't have the
+	configuration flags set right to make infinity work. Setting those
+	properly made everything work without changes to min and max.
+
+        * kjs/config.h: Define HAVE_FUNC_ISINF, HAVE_STRING_H, and
+	also WORDS_BIGENDIAN (if on ppc).
+
+        * kjs/math_object.cpp: (MathFuncImp::call): Roll out min and max
+	changes from yesterday.
+
 2002-09-25  David Hyatt  <hyatt at apple.com>
 
 	Fix the impls of min/max to not use +inf/-inf when you have
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index aa40975..9825fa3 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-09-26  Darin Adler  <darin at apple.com>
+
+	Fix the infinity problem Dave worked around. We didn't have the
+	configuration flags set right to make infinity work. Setting those
+	properly made everything work without changes to min and max.
+
+        * kjs/config.h: Define HAVE_FUNC_ISINF, HAVE_STRING_H, and
+	also WORDS_BIGENDIAN (if on ppc).
+
+        * kjs/math_object.cpp: (MathFuncImp::call): Roll out min and max
+	changes from yesterday.
+
 2002-09-25  David Hyatt  <hyatt at apple.com>
 
 	Fix the impls of min/max to not use +inf/-inf when you have
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index aa40975..9825fa3 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-09-26  Darin Adler  <darin at apple.com>
+
+	Fix the infinity problem Dave worked around. We didn't have the
+	configuration flags set right to make infinity work. Setting those
+	properly made everything work without changes to min and max.
+
+        * kjs/config.h: Define HAVE_FUNC_ISINF, HAVE_STRING_H, and
+	also WORDS_BIGENDIAN (if on ppc).
+
+        * kjs/math_object.cpp: (MathFuncImp::call): Roll out min and max
+	changes from yesterday.
+
 2002-09-25  David Hyatt  <hyatt at apple.com>
 
 	Fix the impls of min/max to not use +inf/-inf when you have
diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h
index 39e7fc9..f22f745 100644
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -1,5 +1,9 @@
-
-#define TIME_WITH_SYS_TIME 1
-#define HAVE_SYS_TIME_H 1
+#define HAVE_FUNC_ISINF 1
 #define HAVE_FUNC_ISNAN 1
-#define HAVE_STRINGS_H
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_SYS_TIME_H 1
+#define TIME_WITH_SYS_TIME 1
+#ifdef __ppc__
+#define WORDS_BIGENDIAN 1
+#endif
diff --git a/JavaScriptCore/kjs/math_object.cpp b/JavaScriptCore/kjs/math_object.cpp
index 93744d1..6ca32d6 100644
--- a/JavaScriptCore/kjs/math_object.cpp
+++ b/JavaScriptCore/kjs/math_object.cpp
@@ -182,12 +182,10 @@ Value MathFuncImp::call(ExecState *exec, Object &/*thisObj*/, const List &args)
       double val = args[k].toNumber(exec);
       if ( isNaN( val ) )
       {
-	    result = NaN;
+        result = NaN;
         break;
       }
-      // Comparing a number to negative infinity doesn't work.  
-      // -dwh
-      if ( k == 0 || val > result )
+      if ( val > result )
         result = val;
     }
     break;
@@ -202,9 +200,7 @@ Value MathFuncImp::call(ExecState *exec, Object &/*thisObj*/, const List &args)
         result = NaN;
         break;
       }
-      // Comparing a number to positive infinity doesn't work.  
-      // -dwh
-      if ( k == 0 || val < result )
+      if ( val < result )
         result = val;
     }
     break;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list