[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

andersca at apple.com andersca at apple.com
Wed Dec 22 17:49:34 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6fb0c680d2c74fa0b87b2095ea88d7b212341bb8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 23:48:07 2010 +0000

    Fix build.
    
    * PluginProcess/mac/PluginProcessShim.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0ead6f8..d714b43 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2010-11-30  Anders Carlsson  <andersca at apple.com>
 
+        Fix build.
+
+        * PluginProcess/mac/PluginProcessShim.cpp:
+
+2010-11-30  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Add a simple shim function for Debugger().
diff --git a/WebKit2/PluginProcess/mac/PluginProcessShim.cpp b/WebKit2/PluginProcess/mac/PluginProcessShim.cpp
index 4ac8fe5..3a64701 100644
--- a/WebKit2/PluginProcess/mac/PluginProcessShim.cpp
+++ b/WebKit2/PluginProcess/mac/PluginProcessShim.cpp
@@ -26,9 +26,12 @@
 #include "PluginProcessShim.h"
 
 #include <Carbon/Carbon.h>
-#include <mach-o/dyld-interposing.h>
 #include <stdio.h>
 
+#define DYLD_INTERPOSE(_replacement,_replacee) \
+    __attribute__((used)) static struct{ const void* replacement; const void* replacee; } _interpose_##_replacee \
+    __attribute__ ((section ("__DATA,__interpose"))) = { (const void*)(unsigned long)&_replacement, (const void*)(unsigned long)&_replacee };
+
 namespace WebKit {
 
 extern "C" void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks& callbacks);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list