aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/src/decode/decode_atom.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-01-23 16:04:38 +0100
committerSverker Eriksson <[email protected]>2013-01-23 16:04:38 +0100
commitc596e17cf3d69cf5e10d28ee2a8ee35162786da1 (patch)
tree19188850b49cfcb8b3d0c2e720947fc105609b24 /lib/erl_interface/src/decode/decode_atom.c
parent5d2aaef89f2e1dce2147ac56a105f129390f31a3 (diff)
downloadotp-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/decode_atom.c')
-rw-r--r--lib/erl_interface/src/decode/decode_atom.c2
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;