summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-14 18:34:06 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-14 18:34:06 +0000
commit3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1 (patch)
treef0bafe7ca3c418c68d480e219107f8667c443240
parentf05391a69f38107ff3f70431032a5520741147d8 (diff)
downloadUXP-3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1.tar
UXP-3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1.tar.gz
UXP-3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1.tar.lz
UXP-3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1.tar.xz
UXP-3b6fd3b6c03224aa0f28b06ef097eeecdecd1dc1.zip
Issue # 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.cpp2
-rw-r--r--gfx/2d/moz.build8
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 <cstring>
+#include <string.h>
#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',