aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/include
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/include
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/include')
-rw-r--r--lib/erl_interface/include/ei.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index 20e575f64d..2278a28adb 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -190,7 +190,12 @@ extern volatile int __erl_errno;
#define MAXATOMLEN_UTF8 (255*4 + 1)
#define MAXNODELEN EI_MAXALIVELEN+1+EI_MAXHOSTNAMELEN
-enum erlang_char_encoding { ERLANG_ASCII, ERLANG_LATIN1, ERLANG_UTF8, ERLANG_WHATEVER };
+enum erlang_char_encoding {
+ ERLANG_ASCII = 1,
+ ERLANG_LATIN1 = 2,
+ ERLANG_UTF8 = 4,
+ ERLANG_ANY = ERLANG_ASCII|ERLANG_LATIN1|ERLANG_UTF8
+};
/* a pid */
typedef struct {