aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2011-06-08 16:03:31 +0200
committerRaimo Niskanen <[email protected]>2011-06-08 16:03:31 +0200
commit45f5b2719226fe60dd26dd23ce4c1f7f9ca9225b (patch)
tree29b7d3f9959857d2601692587cb484dee6e068a1 /erts
parentca9d9f74e01ba63ff38c530707ef08db3ea2daea (diff)
parent3b818d5ec09cd2bb4c650776b898af9206f13c68 (diff)
downloadotp-45f5b2719226fe60dd26dd23ce4c1f7f9ca9225b.tar.gz
otp-45f5b2719226fe60dd26dd23ce4c1f7f9ca9225b.tar.bz2
otp-45f5b2719226fe60dd26dd23ce4c1f7f9ca9225b.zip
Merge branch 'dev' into major
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/prim_file.beambin31528 -> 31640 bytes
-rw-r--r--erts/preloaded/src/prim_file.erl4
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 66fcb9e6a9..00a1cf065a 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 8e0790e74a..ac7570582e 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -63,7 +63,7 @@
-include("file.hrl").
--define(DRV, efile).
+-define(DRV, "efile").
-define(FD_DRV, "efile").
-define(LARGEFILESIZE, (1 bsl 63)).
@@ -549,7 +549,7 @@ write_file(_, _) ->
%% Returns {ok, Port}, the Port should be used as first argument in all
%% the following functions. Returns {error, Reason} upon failure.
start() ->
- try erlang:open_port({spawn, atom_to_list(?DRV)}, [binary]) of
+ try erlang:open_port({spawn, ?DRV}, [binary]) of
Port ->
{ok, Port}
catch