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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 6fc1f3adc12ec6505fecb4fa1d68cf0d43a5a94d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 8 03:10:40 2002 +0000

    	- partial fix to 3073230 - JavaScript time calls do I/O by
    	lastat()ing /etc/localtime
    
            * kjs/date_object.cpp:
            (mktimeUsingCF): Implementation of mktime using CF.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2593 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c232596..b38a827 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-07  Maciej Stachowiak  <mjs at apple.com>
+
+	- partial fix to 3073230 - JavaScript time calls do I/O by
+	lastat()ing /etc/localtime
+	
+        * kjs/date_object.cpp:
+        (mktimeUsingCF): Implementation of mktime using CF.
+
 === Alexander-31 ===
 
 2002-11-01  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index c232596..b38a827 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-11-07  Maciej Stachowiak  <mjs at apple.com>
+
+	- partial fix to 3073230 - JavaScript time calls do I/O by
+	lastat()ing /etc/localtime
+	
+        * kjs/date_object.cpp:
+        (mktimeUsingCF): Implementation of mktime using CF.
+
 === Alexander-31 ===
 
 2002-11-01  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index c232596..b38a827 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-11-07  Maciej Stachowiak  <mjs at apple.com>
+
+	- partial fix to 3073230 - JavaScript time calls do I/O by
+	lastat()ing /etc/localtime
+	
+        * kjs/date_object.cpp:
+        (mktimeUsingCF): Implementation of mktime using CF.
+
 === Alexander-31 ===
 
 2002-11-01  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index b6e4b5d..a7af6e4 100644
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -66,6 +66,7 @@
 
 #define gmtime(x) gmtimeUsingCF(x)
 #define localtime(x) localtimeUsingCF(x)
+#define mktime(x) mktimeUsingCF(x)
 
 struct tm *tmUsingCF(time_t tv, CFTimeZoneRef timeZone)
 {
@@ -111,6 +112,27 @@ struct tm *localtimeUsingCF(const time_t *tv)
     return result;
 }
 
+time_t mktimeUsingCF(struct tm *tm)
+{
+    CFTimeZoneRef timeZone = CFTimeZoneCopyDefault();
+
+    CFGregorianDate date;
+    date.second = tm->tm_sec;
+    date.minute = tm->tm_min;
+    date.hour = tm->tm_hour;
+    date.day = tm->tm_mday;
+    date.month = tm->tm_mon + 1;
+    date.year = tm->tm_year + 1900;
+
+    CFAbsoluteTime absoluteTime = CFGregorianDateGetAbsoluteTime(date, timeZone);
+
+    time_t result = (time_t) (absoluteTime + kCFAbsoluteTimeIntervalSince1970);
+
+    return result;
+}
+
+
+
 #endif // APPLE_CHANGES
 
 using namespace KJS;

-- 
WebKit Debian packaging