summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2017-09-22 12:15:47 +0200
committerAnna Henningsen <anna@addaleax.net>2017-09-22 16:28:52 +0200
commit84063a73144fba50ef55373a26bcbb589b8d156c (patch)
tree5b68a26d089811538efdc76a8a9540d93d36388d
parent6983157adfb49d644fb27985f97f12a54fcc98e1 (diff)
downloadandroid-node-v8-84063a73144fba50ef55373a26bcbb589b8d156c.tar.gz
android-node-v8-84063a73144fba50ef55373a26bcbb589b8d156c.tar.bz2
android-node-v8-84063a73144fba50ef55373a26bcbb589b8d156c.zip
src: do not include internals from node_buffer.h
`node_buffer.h` is a public header, so it should not be using the `node_internals.h` internal header. Ref: 290315ace7eed6eeeb300754dd68fc1af4d80c9b Fixes: https://github.com/nodejs/node/issues/15552 PR-URL: https://github.com/nodejs/node/pull/15554 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Andreas Madsen <amwebdk@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
-rw-r--r--src/node_buffer.h3
-rw-r--r--src/node_serdes.cc5
-rw-r--r--src/spawn_sync.h2
-rw-r--r--src/string_bytes.cc3
4 files changed, 5 insertions, 8 deletions
diff --git a/src/node_buffer.h b/src/node_buffer.h
index d680eb90eb..acf9b23c3b 100644
--- a/src/node_buffer.h
+++ b/src/node_buffer.h
@@ -22,7 +22,8 @@
#ifndef SRC_NODE_BUFFER_H_
#define SRC_NODE_BUFFER_H_
-#include "node_internals.h"
+#include "node.h"
+#include "v8.h"
namespace node {
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
index ced9e4dd98..f477016ec0 100644
--- a/src/node_serdes.cc
+++ b/src/node_serdes.cc
@@ -1,10 +1,7 @@
-#include "node.h"
+#include "node_internals.h"
#include "node_buffer.h"
#include "base-object.h"
#include "base-object-inl.h"
-#include "env.h"
-#include "env-inl.h"
-#include "v8.h"
namespace node {
diff --git a/src/spawn_sync.h b/src/spawn_sync.h
index a3eef5b15e..5b17e40091 100644
--- a/src/spawn_sync.h
+++ b/src/spawn_sync.h
@@ -24,7 +24,7 @@
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-#include "node.h"
+#include "node_internals.h"
#include "node_buffer.h"
namespace node {
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
index 9df42f3bfa..60e88c4588 100644
--- a/src/string_bytes.cc
+++ b/src/string_bytes.cc
@@ -22,9 +22,8 @@
#include "string_bytes.h"
#include "base64.h"
-#include "node.h"
+#include "node_internals.h"
#include "node_buffer.h"
-#include "v8.h"
#include <limits.h>
#include <string.h> // memcpy