summaryrefslogtreecommitdiff
path: root/src/pipe_wrap.cc
diff options
context:
space:
mode:
authorTrevor Norris <trev.norris@gmail.com>2013-08-12 12:54:49 -0700
committerTrevor Norris <trev.norris@gmail.com>2013-08-12 12:54:49 -0700
commit35f789b02795ed8dd177b65f80b53f408dc7fe09 (patch)
treed294203d0dc1f32d89c7d6200e7b038dc0b4b25f /src/pipe_wrap.cc
parent5725864dfdc951ee7616188776b56b9e0a95e8e7 (diff)
downloadandroid-node-v8-35f789b02795ed8dd177b65f80b53f408dc7fe09.tar.gz
android-node-v8-35f789b02795ed8dd177b65f80b53f408dc7fe09.tar.bz2
android-node-v8-35f789b02795ed8dd177b65f80b53f408dc7fe09.zip
src: fix build break from generic macro name
WRAP is too generic a macro name and causes the build to fail from conflicts. They have been prepended with NODE_.
Diffstat (limited to 'src/pipe_wrap.cc')
-rw-r--r--src/pipe_wrap.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
index 8c28357e00..8884fec2cc 100644
--- a/src/pipe_wrap.cc
+++ b/src/pipe_wrap.cc
@@ -67,7 +67,7 @@ Local<Object> PipeWrap::Instantiate() {
PipeWrap* PipeWrap::Unwrap(Local<Object> obj) {
PipeWrap* wrap;
- UNWRAP(obj, PipeWrap, wrap);
+ NODE_UNWRAP(obj, PipeWrap, wrap);
return wrap;
}
@@ -146,7 +146,7 @@ void PipeWrap::Bind(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
PipeWrap* wrap;
- UNWRAP(args.This(), PipeWrap, wrap);
+ NODE_UNWRAP(args.This(), PipeWrap, wrap);
String::AsciiValue name(args[0]);
int err = uv_pipe_bind(&wrap->handle_, *name);
@@ -159,7 +159,7 @@ void PipeWrap::SetPendingInstances(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
PipeWrap* wrap;
- UNWRAP(args.This(), PipeWrap, wrap);
+ NODE_UNWRAP(args.This(), PipeWrap, wrap);
int instances = args[0]->Int32Value();
@@ -172,7 +172,7 @@ void PipeWrap::Listen(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
PipeWrap* wrap;
- UNWRAP(args.This(), PipeWrap, wrap);
+ NODE_UNWRAP(args.This(), PipeWrap, wrap);
int backlog = args[0]->Int32Value();
int err = uv_listen(reinterpret_cast<uv_stream_t*>(&wrap->handle_),
@@ -208,7 +208,7 @@ void PipeWrap::OnConnection(uv_stream_t* handle, int status) {
// Unwrap the client javascript object.
PipeWrap* wrap;
- UNWRAP(client_obj, PipeWrap, wrap);
+ NODE_UNWRAP(client_obj, PipeWrap, wrap);
uv_stream_t* client_handle = reinterpret_cast<uv_stream_t*>(&wrap->handle_);
if (uv_accept(handle, client_handle))
return;
@@ -263,7 +263,7 @@ void PipeWrap::Open(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
PipeWrap* wrap;
- UNWRAP(args.This(), PipeWrap, wrap);
+ NODE_UNWRAP(args.This(), PipeWrap, wrap);
int fd = args[0]->IntegerValue();
@@ -275,7 +275,7 @@ void PipeWrap::Connect(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
PipeWrap* wrap;
- UNWRAP(args.This(), PipeWrap, wrap);
+ NODE_UNWRAP(args.This(), PipeWrap, wrap);
assert(args[0]->IsObject());
assert(args[1]->IsString());