diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 16:01:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 16:01:26 (GMT) |
| commit | 56c8393c5830045f599a22edbe4fd17c18dc827d (patch) | |
| tree | 0bda8c988706930beab2c204a1447092a43d7741 /src/3rdparty | |
| parent | 71c2cfee4bcd81b2552b66b676895dcd9a6a794b (diff) | |
| parent | f93097671f512f38790ba2d56bd5b1e037810266 (diff) | |
| download | Qt-56c8393c5830045f599a22edbe4fd17c18dc827d.zip Qt-56c8393c5830045f599a22edbe4fd17c18dc827d.tar.gz Qt-56c8393c5830045f599a22edbe4fd17c18dc827d.tar.bz2 | |
Merge commit 'upstream/4.6' into oslo-staging-2/4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp index 5ccce0e..b313afb 100644 --- a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp @@ -145,7 +145,7 @@ HDC WINAPI PluginView::hookedBeginPaint(HWND hWnd, PAINTSTRUCT* lpPaint) "push %3\n" "call *%4\n" : "=a" (result) - : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*beginPaint) + : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (beginPaint) : "memory" ); return result; @@ -175,7 +175,7 @@ BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint) "push %3\n" "call *%4\n" : "=a" (result) - : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*endPaint) + : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (endPaint) ); return result; #elif defined (_M_IX86) |