diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-10-17 21:08:48 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-10-24 14:21:58 -0700 |
| commit | 620ab3853abf99ecea3a3d055f47cd6d06433c95 (patch) | |
| tree | 61f35d294ededfa57258fee32e83b54f7f2e0536 /src/rt | |
| parent | 279c35182050889cba42e4adb1438a7f640fdabd (diff) | |
| download | rust-620ab3853abf99ecea3a3d055f47cd6d06433c95.tar.gz rust-620ab3853abf99ecea3a3d055f47cd6d06433c95.zip | |
Test fixes and merge conflicts
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_uv.cpp | 13 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 12 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 7ab57e6909a..55fa09c3818 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -638,19 +638,6 @@ rust_uv_pipe_init(uv_loop_t *loop, uv_pipe_t* p, int ipc) { return uv_pipe_init(loop, p, ipc); } -extern "C" int rust_SOCK_STREAM() { return SOCK_STREAM; } -extern "C" int rust_SOCK_DGRAM() { return SOCK_DGRAM; } -extern "C" int rust_SOCK_RAW() { return SOCK_RAW; } -extern "C" int rust_IPPROTO_UDP() { return IPPROTO_UDP; } -extern "C" int rust_IPPROTO_TCP() { return IPPROTO_TCP; } -extern "C" int rust_AI_ADDRCONFIG() { return AI_ADDRCONFIG; } -extern "C" int rust_AI_ALL() { return AI_ALL; } -extern "C" int rust_AI_CANONNAME() { return AI_CANONNAME; } -extern "C" int rust_AI_NUMERICHOST() { return AI_NUMERICHOST; } -extern "C" int rust_AI_NUMERICSERV() { return AI_NUMERICSERV; } -extern "C" int rust_AI_PASSIVE() { return AI_PASSIVE; } -extern "C" int rust_AI_V4MAPPED() { return AI_V4MAPPED; } - extern "C" int rust_uv_pipe_open(uv_pipe_t *pipe, int file) { return uv_pipe_open(pipe, file); diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 6c3988d6b01..203f2e4d5f2 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -199,18 +199,6 @@ bufrelease bufnew rust_take_dlerror_lock rust_drop_dlerror_lock -rust_SOCK_STREAM -rust_SOCK_DGRAM -rust_SOCK_RAW -rust_IPPROTO_UDP -rust_IPPROTO_TCP -rust_AI_ADDRCONFIG -rust_AI_ALL -rust_AI_CANONNAME -rust_AI_NUMERICHOST -rust_AI_NUMERICSERV -rust_AI_PASSIVE -rust_AI_V4MAPPED rust_uv_pipe_open rust_uv_pipe_bind rust_uv_pipe_connect |