aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRaimo Niskanen <raimo@erlang.org>2016-06-02 08:48:43 +0200
committerRaimo Niskanen <raimo@erlang.org>2016-06-02 08:53:18 +0200
commit1ed217bbf498666e6e568453a32c4144289d0915 (patch)
tree35ddba56ff6ab1c6569fb0e2cebbfadd503a748b /erts/preloaded
parent30a202a41eb51f74d44e25667780136507395713 (diff)
parent03e6d8e02a187633a6a09c77e36670f0892d063d (diff)
downloadotp-1ed217bbf498666e6e568453a32c4144289d0915.tar.gz
otp-1ed217bbf498666e6e568453a32c4144289d0915.tar.bz2
otp-1ed217bbf498666e6e568453a32c4144289d0915.zip
Merge branch 'saleyn/uds/PR-612/OTP-13572'
* saleyn/uds/PR-612/OTP-13572: AF_UNIX is more portable
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/prim_inet.beambin76284 -> 76292 bytes
-rw-r--r--erts/preloaded/src/prim_inet.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index 876f4892a4..edb86d35a6 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index c6434fd83b..71dbfbd0a7 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -1756,7 +1756,7 @@ enc_value_2(addr, {local,Addr}) ->
unicode:characters_to_binary(
Addr, file:native_name_encoding())
end,
- [?INET_AF_LOCAL,byte_size(Bin)|Bin];
+ [?INET_AF_LOCAL,byte_size(Bin),Bin];
%%
enc_value_2(ether, [_,_,_,_,_,_]=Xs) -> Xs;
enc_value_2(sockaddr, any) ->