diff options
| author | Sverker Eriksson <[email protected]> | 2013-01-23 16:04:38 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-01-23 16:04:38 +0100 |
| commit | c596e17cf3d69cf5e10d28ee2a8ee35162786da1 (patch) | |
| tree | 19188850b49cfcb8b3d0c2e720947fc105609b24 /lib/erl_interface/src/decode | |
| parent | 5d2aaef89f2e1dce2147ac56a105f129390f31a3 (diff) | |
| download | otp-c596e17cf3d69cf5e10d28ee2a8ee35162786da1.tar.gz otp-c596e17cf3d69cf5e10d28ee2a8ee35162786da1.tar.bz2 otp-c596e17cf3d69cf5e10d28ee2a8ee35162786da1.zip | |
erl_interface: Changed erlang_char_encoding interface
to allow bitwise-or'd combinations.
Diffstat (limited to 'lib/erl_interface/src/decode')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_atom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_interface/src/decode/decode_atom.c b/lib/erl_interface/src/decode/decode_atom.c index 2ada418243..556c400cb3 100644 --- a/lib/erl_interface/src/decode/decode_atom.c +++ b/lib/erl_interface/src/decode/decode_atom.c @@ -58,7 +58,7 @@ int ei_decode_atom_as(const char *buf, int *index, char* p, int destlen, return -1; } - if (want_enc == got_enc || want_enc == ERLANG_WHATEVER || want_enc == ERLANG_ASCII) { + if ((want_enc & got_enc) || want_enc == ERLANG_ASCII) { int i, found_non_ascii = 0; if (len >= destlen) return -1; |