diff options
author | Moonchild <moonchild@palemoon.org> | 2020-05-14 18:34:06 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-05-14 18:34:06 +0000 |
commit | bd4767bef0dcb6b995219507b82ccffe102ebd83 (patch) | |
tree | f0bafe7ca3c418c68d480e219107f8667c443240 | |
parent | 7f638d9a335ed604f602acc8798baacd6935dcfc (diff) | |
download | uxp-bd4767bef0dcb6b995219507b82ccffe102ebd83.tar.gz |
Issue mcp-graveyard/UXP# 80 - Fix up gfx/2d/DataSurfaceHelpers
De-unified build requires <string.h> instead of <cstring> to
prevent stdlib confusion.
-rw-r--r-- | gfx/2d/DataSurfaceHelpers.cpp | 2 | ||||
-rw-r--r-- | 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 87ef00fcd2..99dfe063a3 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 <cstring> +#include <string.h> #include "2D.h" #include "DataSurfaceHelpers.h" diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index c862f413fa..33b49038ff 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', |