Bug 114121 – [GTK] Windows build failure after r136056

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Kalev Lember]

CXX      Source/WebCore/platform/graphics/cairo/Programs_TestWebKitAPI_TestGtk-IntRectCairo.o

../Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp:28:1: error: prototype for 'WebCore::IntRect::IntRect(const cairo_rectangle_int_t&)' does not match any in class 'WebCore::IntRect'
 IntRect::IntRect(const cairo_rectangle_int_t& r)
 ^
In file included from ../Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp:22:0:
../Source/WebCore/platform/graphics/IntRect.h:82:7: error: candidates are: WebCore::IntRect::IntRect(const WebCore::IntRect&)
 class IntRect {
       ^
../Source/WebCore/platform/graphics/IntRect.h:92:14: error:                 WebCore::IntRect::IntRect(const WebCore::LayoutRect&)
     explicit IntRect(const LayoutRect&); // don't do this implicitly since it's lossy
              ^
../Source/WebCore/platform/graphics/IntRect.h:91:14: error:                 WebCore::IntRect::IntRect(const WebCore::FloatRect&)
     explicit IntRect(const FloatRect&); // don't do this implicitly since it's lossy
              ^
../Source/WebCore/platform/graphics/IntRect.h:88:5: error:                 WebCore::IntRect::IntRect(int, int, int, int)
     IntRect(int x, int y, int width, int height)
     ^
../Source/WebCore/platform/graphics/IntRect.h:86:5: error:                 WebCore::IntRect::IntRect(const WebCore::IntPoint&, const WebCore::IntSize&)
     IntRect(const IntPoint& location, const IntSize& size)
     ^
../Source/WebCore/platform/graphics/IntRect.h:85:5: error:                 WebCore::IntRect::IntRect()
     IntRect() { }
     ^
../Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp:34:43: error: no 'WebCore::IntRect::operator cairo_rectangle_int_t() const' member function declared in class 'WebCore::IntRect'
 IntRect::operator cairo_rectangle_int_t() const
                                           ^
make[1]: *** [Source/WebCore/platform/graphics/cairo/Programs_TestWebKitAPI_TestGtk-IntRectCairo.o] Error 1

[Kalev Lember]

r136056 broke the build for some Windows ports that aren't the apple-win port. Looks like the config.h addition should be guarded by PLATFORM(WIN) instead of #ifdef(WIN32). The #undefs there don't make sense for GTK Windows port, at least.

[Kalev Lember]

Created attachment 196793 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 196793 [details]
Patch

Clearing flags on attachment: 196793

Committed r148230: <http://trac.webkit.org/changeset/148230>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.