Fix standalone ninja build on Linux

Preprocessor conditions referring to undefined macros failed standalone build which uses the -Werror=undef setting. This same error has been in multiple patches, and reverting them would cause test breakage, so fixing the issue is simpler than reverting. Change-Id: I4a079ef5d823eed76ebdefa8be413f63d29a5f6a Reviewed-on: https://chromium-review.googlesource.com/304020Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Tested-by: Olli Etuaho <oetuaho@nvidia.com>

Fix standalone ninja build on Linux
36b73909 · Olli Etuaho · 5f579b1b · 36b73909 · 36b73909 · 36b73909
Commit 36b73909 authored Oct 05, 2015 by Olli Etuaho
Showing with 3 additions and 3 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +1 -1

ClearTest.cpp src/tests/gl_tests/ClearTest.cpp +1 -1

PackUnpackTest.cpp src/tests/gl_tests/PackUnpackTest.cpp +1 -1

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -574,7 +574,7 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
        functions->standard == STANDARD_GL_DESKTOP &&
        (vendor == VENDOR_ID_INTEL || vendor == VENDOR_ID_AMD);
-#if ANGLE_PLATFORM_APPLE
+#if defined(ANGLE_PLATFORM_APPLE)
    workarounds->doWhileGLSLCausesGPUHang = true;
 #endif
 }

--- a/src/tests/gl_tests/ClearTest.cpp
+++ b/src/tests/gl_tests/ClearTest.cpp
@@ -259,7 +259,7 @@ TEST_P(ClearTestES3, SRGBClear)
 TEST_P(ClearTestES3, MixedSRGBClear)
 {
    // TODO(cwallez) figure out why it is broken on Intel on Mac
-#if ANGLE_PLATFORM_APPLE
+#if defined(ANGLE_PLATFORM_APPLE)
    if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
    {
        std::cout << "Test skipped on Intel on Mac." << std::endl;

--- a/src/tests/gl_tests/PackUnpackTest.cpp
+++ b/src/tests/gl_tests/PackUnpackTest.cpp
@@ -150,7 +150,7 @@ TEST_P(PackUnpackTest, PackUnpackSnormNormal)
 TEST_P(PackUnpackTest, PackUnpackHalfNormal)
 {
    // TODO(cwallez) figure out why it is broken on Intel on Mac
-#if ANGLE_PLATFORM_APPLE
+#if defined(ANGLE_PLATFORM_APPLE)
    if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
    {
        std::cout << "Test skipped on Intel on Mac." << std::endl;