summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/rexi/src/rexi_utils.erl4
-rw-r--r--couchjs/c_src/SConscript2
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')