| Summary: | [W32][GTK] Conflict between NO_ERROR from W32API and GraphicsContext3D | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | LRN <lrn1986> | ||||||
| Component: | New Bugs | Assignee: | Nobody <webkit-unassigned> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | cgarcia, cmarcelo, commit-queue, dino, esprehn+autocc, gyuyoung.kim, kondapallykalyan, lrn1986, luiz, noam, roger_fong | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Bug Depends on: | |||||||||
| Bug Blocks: | 133028 | ||||||||
| Attachments: |
|
||||||||
Created attachment 250814 [details]
Work around name conflicts (NO_ERROR)
In file included from /mingw/include/_mingw.h:12:0,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32,
from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30,
from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27:
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()':
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant
return GraphicsContext3D::NO_ERROR;
because NO_ERROR is also a macro defined in Windows headers. Ouch.
Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination,
in addition to the workaround for VERSION already present there.
Attachment 250814 [details] did not pass style-queue:
ERROR: Source/WebCore/ChangeLog:23: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5]
Total errors found: 1 in 5 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 250842 [details]
Work around name conflicts (NO_ERROR)
In file included from /mingw/include/_mingw.h:12:0,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32,
from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30,
from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27:
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()':
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant
return GraphicsContext3D::NO_ERROR;
because NO_ERROR is also a macro defined in Windows headers. Ouch.
Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination,
in addition to the workaround for VERSION already present there.
Comment on attachment 250842 [details] Work around name conflicts (NO_ERROR) View in context: https://bugs.webkit.org/attachment.cgi?id=250842&action=review I don't understand why the workaround needs to be duplicated, but LRN confirmed it doesn't build otherwise. > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:88 > +#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS)) I'll remove the QT thing before landing Committed to 2.4 http://trac.webkit.org/changeset/184545 |
In file included from /mingw/include/_mingw.h:12:0, from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93, from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32, from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30, from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27: ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()': ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant return GraphicsContext3D::NO_ERROR; because NO_ERROR is also a macro defined in Windows headers. Ouch.