[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.1.3-1-3-g62f2635

[Mike Hommey]

The following commit has been merged in the debian/experimental branch:
commit dd216b0d687a293b5209602f0853362fc142ec8f
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Mar 26 20:47:29 2009 +0100

    Use the first definition of RETURN_PAIR on x86-64 only
    
    The second version is 32-bits safe and should work on anything with
    32-bits userspace, including Mac. The first version, on the other
    hand, should work on 64-bits machines. Ideally, there should be a
     #if PLATFORM(64-BIT) but as far as I know, there isn't one.

diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index b7b8f35..1bf55e7 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -73,8 +73,7 @@ namespace JSC {
     #endif
 #endif
 
-// The Mac compilers are fine with this, 
-#if PLATFORM(MAC)
+#if PLATFORM(X86_64)
     struct VoidPtrPair {
         void* first;
         void* second;
diff --git a/debian/changelog b/debian/changelog
index 252fd80..955348b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 webkit (1.1.3-2) experimental; urgency=low
 
+  [ Gustavo Noronha Silva ]
   * debian/control, debian/libwebkit-1.0-{2,bin}.install:
   - add a new libwebkit-1.0-bin package to distribute the GtkLauncher and
     DumpRenderTree binaries in, so that different soversions of the
     library are installable in parallel (Closes: #520981)
 
+  [ Mike Hommey ]
+  * JavaScriptCore/jit/JITStubs.h:
+  - Use the first definition of RETURN_PAIR on x86-64.
+
  -- Gustavo Noronha Silva <kov at debian.org>  Wed, 25 Mar 2009 11:16:00 -0300
 
 webkit (1.1.3-1) experimental; urgency=low

-- 
WebKit Debian packaging