[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 41cc4625aeeb38213b0162fa3f87cc57aee125e4
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 04:07:39 2011 +0000

    Windows build fix. Change the inline type of consumePermanently.
    
    * Shared/SandboxExtension.h:
    (WebKit::SandboxExtension::consumePermanently):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ffc00c0..342b3ad 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-04  Brian Weinstein  <bweinstein at apple.com>
+
+        Windows build fix. Change the inline type of consumePermanently.
+
+        * Shared/SandboxExtension.h:
+        (WebKit::SandboxExtension::consumePermanently):
+
 2011-01-04  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/Shared/SandboxExtension.h b/WebKit2/Shared/SandboxExtension.h
index b712023..ba674d4 100644
--- a/WebKit2/Shared/SandboxExtension.h
+++ b/WebKit2/Shared/SandboxExtension.h
@@ -93,7 +93,7 @@ inline void SandboxExtension::createHandle(const String& path, Type type, Handle
 inline SandboxExtension::~SandboxExtension() { }
 inline bool SandboxExtension::invalidate() { return true; }
 inline bool SandboxExtension::consume() { return true; }
-inline void SandboxExtension::consumePermanently() { return true; }
+inline bool SandboxExtension::consumePermanently() { return true; }
 #endif
 
 } // namespace WebKit

-- 
WebKit Debian packaging