From 7d42797c1fde358493cce1cb603c8e489218bfb8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 21 Jul 2016 00:51:57 -0600 Subject: [PATCH] Update node headers including --- atom/app/node_main.cc | 3 ++- atom/common/native_mate_converters/v8_value_converter.cc | 3 ++- atom/common/node_includes.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc index 6f71d39f5740..d06e89c74828 100644 --- a/atom/app/node_main.cc +++ b/atom/app/node_main.cc @@ -7,7 +7,6 @@ #include "atom/app/uv_task_runner.h" #include "atom/browser/javascript_environment.h" #include "atom/browser/node_debugger.h" -#include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/thread_task_runner_handle.h" @@ -15,6 +14,8 @@ #include "gin/public/isolate_holder.h" #include "gin/v8_initializer.h" +#include "atom/common/node_includes.h" + namespace atom { int NodeMain(int argc, char *argv[]) { diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc index 37e09aec5750..d53fe6f62713 100644 --- a/atom/common/native_mate_converters/v8_value_converter.cc +++ b/atom/common/native_mate_converters/v8_value_converter.cc @@ -12,7 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "native_mate/dictionary.h" -#include "vendor/node/src/node_buffer.h" + +#include "atom/common/node_includes.h" namespace atom { diff --git a/atom/common/node_includes.h b/atom/common/node_includes.h index 46b6fa058ebb..01efa6b15470 100644 --- a/atom/common/node_includes.h +++ b/atom/common/node_includes.h @@ -19,6 +19,7 @@ #undef CHECK_GT #undef CHECK_LE #undef CHECK_LT +#undef UNLIKELY #undef DISALLOW_COPY_AND_ASSIGN #undef NO_RETURN #undef arraysize