diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-08 16:23:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-08 16:23:48 +0100 |
| commit | 27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b (patch) | |
| tree | c6017fc754dc4ff2f39dc7989009d31c8fd9a81c /lib/erl_interface/src/legacy/erl_marshal.c | |
| parent | 7d1060c624676c5dde532d1cb59fa177329f4178 (diff) | |
| parent | b0693061137de237c38965c556c7d6ded8977394 (diff) | |
| download | otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.tar.gz otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.tar.bz2 otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.zip | |
Merge branch 'sverk/erl_interface-enum-typedef'
* sverk/erl_interface-enum-typedef:
erl_interface: Change enum erlang_char_encoding to a typedef
Diffstat (limited to 'lib/erl_interface/src/legacy/erl_marshal.c')
| -rw-r--r-- | lib/erl_interface/src/legacy/erl_marshal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c index c051c3a597..e207b5f0f1 100644 --- a/lib/erl_interface/src/legacy/erl_marshal.c +++ b/lib/erl_interface/src/legacy/erl_marshal.c @@ -660,7 +660,7 @@ static int read_atom(unsigned char** ext, Erl_Atom_data* a) { char buf[MAXATOMLEN_UTF8]; int offs = 0; - enum erlang_char_encoding enc; + erlang_char_encoding enc; int ret = ei_decode_atom_as((char*)*ext, &offs, buf, MAXATOMLEN_UTF8, ERLANG_LATIN1|ERLANG_UTF8, NULL, &enc); *ext += offs; @@ -1423,8 +1423,8 @@ static int cmpbytes(unsigned char* s1,int l1,unsigned char* s2,int l2) static int cmpatoms(unsigned char* s1, int l1, unsigned char tag1, unsigned char* s2, int l2, unsigned char tag2) { - enum erlang_char_encoding enc1 = tag2enc(tag1); - enum erlang_char_encoding enc2 = tag2enc(tag2); + erlang_char_encoding enc1 = tag2enc(tag1); + erlang_char_encoding enc2 = tag2enc(tag2); if (enc1 == enc2) { return cmpbytes(s1, l1,s2,l2); |