From 067be2b3fe2723215dea3a5ac3b25eb36d6ca987 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 19 Jun 2012 22:24:09 +0200 Subject: [PATCH] node: fix namespacing issue in ev-emul.h Always use C linkage, prevent accidental name mangling. --- src/ev-emul.h | 8 ++++++++ src/node.h | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ev-emul.h b/src/ev-emul.h index ee85db1..4355b4e 100644 --- a/src/ev-emul.h +++ b/src/ev-emul.h @@ -30,6 +30,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + #undef ev_init #undef ev_set_cb #undef ev_set_priority @@ -248,4 +252,8 @@ inline static void __ev_unref(void) { #undef __uv_container_of #undef __uv_warn_of +#ifdef __cplusplus +} +#endif + #endif /* NODE_EV_EMUL_H_ */ diff --git a/src/node.h b/src/node.h index e9028d1..c86caff 100644 --- a/src/node.h +++ b/src/node.h @@ -274,10 +274,11 @@ MakeCallback(const v8::Handle object, int argc, v8::Handle argv[]); +} // namespace node + #if !defined(NODE_WANT_INTERNALS) && !defined(_WIN32) # include "ev-emul.h" # include "eio-emul.h" #endif -} // namespace node #endif // SRC_NODE_H_ -- 2.7.4