4 files changed, 47 insertions, 9 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 784ba78d3e..7055fcd5c9 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,42 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix using sizeof() for array given as function argument</p>
+          <p>
+	    When using the sizeof() operator for an array given as
+	    function argument it returns the size of the pointer. In
+	    this case, the affected function hex(char digest[16],
+	    char buff[33]) will just print 4 or 8 byte instead of the
+	    full length of 16 bytes, on 32bit and 64bit systems
+	    respectively. (Thanks to Cristian greco)</p>
+          <p>
+	    Own Id: OTP-9151</p>
+        </item>
+        <item>
+          <p>
+	    Initialize <c>to</c> and <c>to_name</c> in
+	    <c>erl_receive_msg</c>. (Thanks to G�ran Larsson)</p>
+          <p>
+	    Own Id: OTP-9241</p>
+        </item>
+        <item>
+          <p>
+	    erl_interface: fix compile error(Thanks to Michael
+	    Santos)</p>
+          <p>
+	    Own Id: OTP-9252</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 50c5a4161d..ba8f8fbce3 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -185,7 +185,12 @@ static int verify_dns_configuration(void)
  * align: increment buf until it is dword-aligned, reduce len by same amount.
  * advance:  increment buf by n bytes, reduce len by same amount .
  */
-#define align_buf(buf,len) for (;(((unsigned)buf)&0x3); (buf)++, len--)
+#if defined SIZEOF_VOID_P
+#define ALIGNBYTES (SIZEOF_VOID_P - 1)
+#else
+#define ALIGNBYTES (sizeof(void*) - 1)
+#endif
+#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--)
 #define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n))
 
 /* "and now the tricky part..." */
diff --git a/lib/erl_interface/src/epmd/epmd_port.c b/lib/erl_interface/src/epmd/epmd_port.c
index 698c75c217..a433815eb7 100644
--- a/lib/erl_interface/src/epmd/epmd_port.c
+++ b/lib/erl_interface/src/epmd/epmd_port.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -228,11 +228,8 @@ int ei_epmd_port (struct in_addr *addr, const char *alive, int *dist)
     return ei_epmd_port_tmo (addr, alive, dist, 0);
 }
 
-int ei_epmd_port_tmo (struct in_addr *addr, const char *alive, int *dist, 
-		       unsigned ms)
+int ei_epmd_port_tmo (struct in_addr *addr, const char *alive, int *dist, unsigned ms)
 {
-  int i;
-
-  return ei_epmd_r4_port(addr,alive,dist,ms);
+    return ei_epmd_r4_port(addr,alive,dist,ms);
 }
 
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 0317462106..75f2b7101b 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.3
+EI_VSN = 3.7.4