From 211e386c894d0ff2b90a9c11f671d6092f428ef5 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 1 Apr 2015 21:33:08 +0800 Subject: [PATCH] win: Fix linking errors --- atom/common/node_bindings.cc | 5 ----- atom/common/node_includes.h | 2 ++ vendor/node | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index 9764d11aea08..1ff9c1685c4b 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -22,11 +22,6 @@ using content::BrowserThread; -// Forward declaration of internal node functions. -namespace node { -void Init(int*, const char**, int*, const char***); -} - // Force all builtin modules to be referenced so they can actually run their // DSO constructors, see http://git.io/DRIqCg. #define REFERENCE_MODULE(name) \ diff --git a/atom/common/node_includes.h b/atom/common/node_includes.h index 80567cbd49b4..0c4189b2fac3 100644 --- a/atom/common/node_includes.h +++ b/atom/common/node_includes.h @@ -7,6 +7,8 @@ // Include common headers for using node APIs. +#define BUILDING_NODE_EXTENSION + #undef ASSERT #undef CHECK #undef CHECK_EQ diff --git a/vendor/node b/vendor/node index ea394ef8974a..790c4a3af361 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit ea394ef8974a06918af0c6f104a07bff3f4e627f +Subproject commit 790c4a3af36144fcdd5fe39d0cb6cd622f282434