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/test | |
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/test')
-rw-r--r-- | lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c | 10 | ||||
-rw-r--r-- | lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c index 6db04aa676..f5c8c4fa7d 100644 --- a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c +++ b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c @@ -40,10 +40,12 @@ err, size1, SIZE, (EI_LONGLONG)p); #endif +#define ERLANG_ANY (ERLANG_ASCII|ERLANG_LATIN1|ERLANG_UTF8) + struct my_atom { - enum erlang_char_encoding from; - enum erlang_char_encoding was_check; - enum erlang_char_encoding result_check; + erlang_char_encoding from; + erlang_char_encoding was_check; + erlang_char_encoding result_check; }; /* Allow arrays constants to be part of macro arguments */ @@ -668,7 +670,7 @@ TESTCASE(test_ei_decode_utf8_atom) int ei_decode_my_atom_as(const char *buf, int *index, char *to, struct my_atom *atom) { - enum erlang_char_encoding was,result; + erlang_char_encoding was,result; int res = ei_decode_atom_as(buf,index,to,1024,atom->from,&was,&result); if (res != 0) return res; diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c index 6472cf8db4..317e5edecd 100644 --- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c +++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c @@ -47,7 +47,7 @@ struct Type { typedef struct { char name[MAXATOMLEN_UTF8]; - enum erlang_char_encoding enc; + erlang_char_encoding enc; }my_atom; int ei_decode_my_atom(const char *buf, int *index, my_atom* a) |