[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

ggaren at apple.com ggaren at apple.com
Wed Apr 7 23:25:18 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 9c283f55c73ef12c58146d6fdecfb75ad86f3bd9
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 6 23:48:38 2009 +0000

    Build fix: added some #includes.
    
    Patch by Geoffrey Garen <ggaren at apple.com> on 2009-11-06
    * wtf/CurrentTime.h:
    * wtf/DateMath.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2ebabd0..1beb7a1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-06  Geoffrey Garen  <ggaren at apple.com>
 
+        Build fix: added some #includes.
+
+        * wtf/CurrentTime.h:
+        * wtf/DateMath.h:
+
+2009-11-06  Geoffrey Garen  <ggaren at apple.com>
+
         Reviewed by Oliver Hunt.
         
         https://bugs.webkit.org/show_bug.cgi?id=31197
diff --git a/JavaScriptCore/wtf/CurrentTime.h b/JavaScriptCore/wtf/CurrentTime.h
index 81f22db..472770e 100644
--- a/JavaScriptCore/wtf/CurrentTime.h
+++ b/JavaScriptCore/wtf/CurrentTime.h
@@ -32,6 +32,8 @@
 #ifndef CurrentTime_h
 #define CurrentTime_h
 
+#include <time.h>
+
 namespace WTF {
 
     // Returns the current UTC time in seconds, counted from January 1, 1970.
diff --git a/JavaScriptCore/wtf/DateMath.h b/JavaScriptCore/wtf/DateMath.h
index bf67394..4735968 100644
--- a/JavaScriptCore/wtf/DateMath.h
+++ b/JavaScriptCore/wtf/DateMath.h
@@ -42,8 +42,9 @@
 #ifndef DateMath_h
 #define DateMath_h
 
-#include <time.h>
+#include <math.h>
 #include <string.h>
+#include <time.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/UnusedParam.h>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list