From 3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 14 May 2020 18:34:06 +0000 Subject: Issue # 80 - Fix up gfx/2d/DataSurfaceHelpers De-unified build requires instead of to prevent stdlib confusion. --- gfx/2d/DataSurfaceHelpers.cpp | 2 +- gfx/2d/moz.build | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gfx/2d/DataSurfaceHelpers.cpp b/gfx/2d/DataSurfaceHelpers.cpp index 87ef00fcd..99dfe063a 100644 --- a/gfx/2d/DataSurfaceHelpers.cpp +++ b/gfx/2d/DataSurfaceHelpers.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include "2D.h" #include "DataSurfaceHelpers.h" diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index c862f413f..33b49038f 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -141,15 +141,11 @@ elif CONFIG['CPU_ARCH'].startswith('mips'): 'convolverLS3.cpp', ] -# Won't build non-unified with a build error in iosfwd `strlen` (??) -UNIFIED_SOURCES += [ - 'DataSourceSurface.cpp', - 'DataSurfaceHelpers.cpp', -] - SOURCES += [ 'BezierUtils.cpp', 'Blur.cpp', + 'DataSourceSurface.cpp', + 'DataSurfaceHelpers.cpp', 'DrawEventRecorder.cpp', 'DrawingJob.cpp', 'DrawTarget.cpp', -- cgit v1.2.3