Merge branch 'sverk/erlang_pid-revert'

* sverk/erlang_pid-revert:
  erl_interface: Fix some warnings in test code
  erl_interface,ic: Remove node_org_enc from erlang_{pid,port,ref}

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
index 7d5abcc376..b2c5b0c836 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
@@ -393,7 +393,6 @@ int main(int argc, char **argv)
     env->_from_pid = &pid;
     
     strcpy(pid.node, this_node);
-    pid.node_org_enc = ERLANG_LATIN1;
     pid.num = fd;
     pid.serial = 0;
     pid.creation = 0;
@@ -1010,7 +1009,7 @@ static int string4_test(IC_Env *env)
 
 static int pid_test(IC_Env *env)
 {
-    erlang_pid pid = {"", ERLANG_LATIN1, 7, 0, 0}, pido, pidr;
+    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
 
     strcpy(pid.node, this_node), /* this currently running node */
     fprintf(stdout, "\n======== m_i_pid test ======\n\n");
@@ -1034,7 +1033,7 @@ static int pid_test(IC_Env *env)
 
 static int port_test(IC_Env *env)
 {
-    erlang_port porti = {"node", ERLANG_LATIN1, 5, 1}, porto, portr;
+    erlang_port porti = {"node", 5, 1}, porto, portr;
 
     fprintf(stdout, "\n======== m_i_port test ======\n\n");
     portr = m_i_port_test(NULL, &porti, &porto, env);
@@ -1057,7 +1056,7 @@ static int port_test(IC_Env *env)
 
 static int ref_test(IC_Env *env)
 {
-    erlang_ref refi = { "node1", ERLANG_LATIN1, 3, {1, 2, 3}, 1},  
+    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
 	refo, refr;
 
     fprintf(stdout, "\n======== m_i_ref test ======\n\n");
@@ -1115,7 +1114,6 @@ static int typedef_test(IC_Env *env)
     long tl;
 
     strcpy(mbi.node,"node");
-    mbi.node_org_enc = ERLANG_LATIN1;
     mbi.id = 15;
     mbi.creation = 1;