Fix C++17 build with Clang

BrowserWorks · Aug 16, 2021 · 152251a · 152251a
1 parent 7b89964
commit 152251a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/memory/build/mozmemory_wrap.c b/memory/build/mozmemory_wrap.c
@@ -2,7 +2,6 @@
  * 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 <string.h>
 #include "mozmemory_wrap.h"
 #include "mozilla/Types.h"
 

diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h
@@ -118,6 +118,13 @@
 #  define IMPL_MFBT
 #endif
 
+#ifdef __cplusplus
+#  include <cstdlib>
+#  include <cstring>
+#else
+#  include <stdlib.h>
+#  include <string.h>
+#endif
 #include "mozilla/Types.h"
 
 #ifndef MOZ_EXTERN_C