Merge branch 'sverk/erl_interface-enum-typedef'

* sverk/erl_interface-enum-typedef:
  erl_interface: Change enum erlang_char_encoding to a typedef

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c
index 9e778a299e..7ca4f430de 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.c
+++ b/lib/erl_interface/src/legacy/erl_eterm.c
@@ -154,7 +154,7 @@ ETERM *erl_mk_atom (const char *s)
 char* erl_atom_ptr_latin1(Erl_Atom_data* a)
 {
     if (a->latin1 == NULL) {
-	enum erlang_char_encoding enc;
+	erlang_char_encoding enc;
 	a->lenL = utf8_to_latin1(NULL, a->utf8, a->lenU, a->lenU, &enc);
 	if (a->lenL < 0) {
 	    a->lenL = 0;
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);