diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-06-19 22:24:09 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-06-19 23:04:59 +0200 |
| commit | 067be2b3fe2723215dea3a5ac3b25eb36d6ca987 (patch) | |
| tree | 06347e418b50a9383bf3eb1917b0bb9966a7276f | |
| parent | 3f687dbddf4d725e9f9faf560a665c4256480681 (diff) | |
| download | android-node-v8-067be2b3fe2723215dea3a5ac3b25eb36d6ca987.tar.gz android-node-v8-067be2b3fe2723215dea3a5ac3b25eb36d6ca987.tar.bz2 android-node-v8-067be2b3fe2723215dea3a5ac3b25eb36d6ca987.zip | |
node: fix namespacing issue in ev-emul.h
Always use C linkage, prevent accidental name mangling.
| -rw-r--r-- | src/ev-emul.h | 8 | ||||
| -rw-r--r-- | src/node.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ev-emul.h b/src/ev-emul.h index ee85db12d4..4355b4ef6b 100644 --- a/src/ev-emul.h +++ b/src/ev-emul.h @@ -30,6 +30,10 @@ #include <stdint.h> #include <string.h> +#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 e9028d1fc8..c86caff0f9 100644 --- a/src/node.h +++ b/src/node.h @@ -274,10 +274,11 @@ MakeCallback(const v8::Handle<v8::Object> object, int argc, v8::Handle<v8::Value> 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_ |