diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-27 02:11:30 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-28 15:30:37 +0000 |
commit | 54e605a32bdceab163e4f2725794c1aab43adc73 (patch) | |
tree | 493e0254601213505e06fcf12900646da050025a /Source/WebKit2/UIProcess/API | |
parent | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (diff) | |
download | qtwebkit-54e605a32bdceab163e4f2725794c1aab43adc73.tar.gz |
Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300
Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
-rw-r--r-- | Source/WebKit2/UIProcess/API/C/WKNativeEvent.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h b/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h index bfce62e00..70fa8f3c5 100644 --- a/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h +++ b/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h @@ -43,8 +43,6 @@ class NSEvent; struct NSEvent; #endif typedef NSEvent *WKNativeEventPtr; -#elif defined(WIN32) || defined(_WIN32) -typedef const struct tagMSG* WKNativeEventPtr; #elif defined(BUILDING_GTK__) typedef union _GdkEvent GdkEvent; typedef const GdkEvent* WKNativeEventPtr; diff --git a/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h b/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h index 24a45afd4..0b643da4c 100644 --- a/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h +++ b/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h @@ -242,7 +242,7 @@ template<typename T, typename U> inline bool operator!=(T* a, const WKRetainPtr< return a != b.get(); } -template<typename T> inline WKRetainPtr<T> adoptWK(T) __attribute__((warn_unused_result)); +template<typename T> inline WKRetainPtr<T> adoptWK(T) WARN_UNUSED_RETURN; template<typename T> inline WKRetainPtr<T> adoptWK(T o) { return WKRetainPtr<T>(AdoptWK, o); |