diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2010-10-23 12:35:12 -0400 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2010-10-23 12:35:12 -0400 |
| commit | 0562f28f6f33cb6381c1bd65489c6c351d4fdb28 (patch) | |
| tree | 64eaa37e8605faf06f935fd95bf6aac18ed1ede2 | |
| parent | b25b5b1966960a580293a0bdefcf8d290efe9b4d (diff) | |
b25b5b was sloppy, erlang:send_after/3 does not wrap w/ ok
| -rw-r--r-- | apps/rexi/src/rexi_utils.erl | 4 | ||||
| -rw-r--r-- | couchjs/c_src/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/rexi/src/rexi_utils.erl b/apps/rexi/src/rexi_utils.erl index 1e8820e1..3b6102da 100644 --- a/apps/rexi/src/rexi_utils.erl +++ b/apps/rexi/src/rexi_utils.erl @@ -9,11 +9,11 @@ recv(Refs, Keypos, Fun, Acc0, infinity, PerMsgTO) -> process_mailbox(Refs, Keypos, Fun, Acc0, nil, PerMsgTO); recv(Refs, Keypos, Fun, Acc0, GlobalTimeout, PerMsgTO) -> TimeoutRef = erlang:make_ref(), - {ok, TRef} = erlang:send_after(GlobalTimeout, self(), {timeout, TimeoutRef}), + TRef = erlang:send_after(GlobalTimeout, self(), {timeout, TimeoutRef}), try process_mailbox(Refs, Keypos, Fun, Acc0, TimeoutRef, PerMsgTO) after - timer:cancel(TRef) + erlang:cancel_timer(TRef) end. process_mailbox(RefList, Keypos, Fun, Acc0, TimeoutRef, PerMsgTO) -> diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index 757e0289..81fa6009 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -17,7 +17,7 @@ def require_lib(name): print 'Could not find required library', name Exit(1) -env = Environment(CCFLAGS='-g -O2 -DXP_UNIX') +env = Environment(CCFLAGS='-g -O2 -DXP_UNIX', LIBPATH='/opt/csw') if not env.GetOption('clean'): conf = Configure(env, config_h='config.h') |