diff options
| author | Raimo Niskanen <[email protected]> | 2011-06-08 15:28:39 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2011-06-08 15:28:39 +0200 |
| commit | 3b818d5ec09cd2bb4c650776b898af9206f13c68 (patch) | |
| tree | 276777cac5b57b1d3beab2abf5d496ec36517c4f /erts | |
| parent | 8ad38e22ca724906fb1e3c789f4846c0c81d284d (diff) | |
| parent | a8056b31944c228f16a27034f07ffad59190984e (diff) | |
| download | otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.tar.gz otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.tar.bz2 otp-3b818d5ec09cd2bb4c650776b898af9206f13c68.zip | |
Merge branch 'sa/prim-file-fix' into dev
* sa/prim-file-fix:
Update preloaded module
Replace atom in DRV macro in prim_file with string
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 31528 -> 31640 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_file.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex 66fcb9e6a9..00a1cf065a 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam 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 |