6 files changed, 49 insertions, 15 deletions
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
index 9578cd35c4..5d555a5123 100644
--- a/lib/erl_interface/aclocal.m4
+++ b/lib/erl_interface/aclocal.m4
@@ -1849,6 +1849,32 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to CFLAGS])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $CFLAGS";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $CFLAGS")
+    else
+        AC_MSG_RESULT([no])
+        AS_VAR_SET($2, "$CFLAGS")
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 97f1cff345..d511f2e240 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -273,6 +273,8 @@ esac
 AC_SUBST(WFLAGS)
 
 if test "x$GCC" = xyes; then
+  # Treat certain GCC warnings as errors
+  LM_TRY_ENABLE_CFLAG([-Werror=return-type], [WERRORFLAGS])
   WFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
   # check which GCC version
   GCC_VERSION=`$CC -v 2>&1 | sed -n 's/gcc version //p'`
@@ -287,8 +289,10 @@ if test "x$GCC" = xyes; then
     *)
         WFLAGS="$WFLAGS -fno-strict-aliasing";;
   esac
+  CFLAGS="$WERRORFLAGS $CFLAGS"
 else
   WFLAGS=""
+  WERRORFLAGS=""
 fi
 
 # ---------------------------------------------------------------------------
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index ba8f8fbce3..79d259b92d 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -186,11 +186,11 @@ static int verify_dns_configuration(void)
  * advance:  increment buf by n bytes, reduce len by same amount .
  */
 #if defined SIZEOF_VOID_P
-#define ALIGNBYTES (SIZEOF_VOID_P - 1)
+#define EI_ALIGNBYTES (SIZEOF_VOID_P - 1)
 #else
-#define ALIGNBYTES (sizeof(void*) - 1)
+#define EI_ALIGNBYTES (sizeof(void*) - 1)
 #endif
-#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--)
+#define align_buf(buf,len) for (;(((unsigned)buf) & EI_ALIGNBYTES); (buf)++, len--)
 #define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n))
 
 /* "and now the tricky part..." */
@@ -282,6 +282,8 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b
   return 0;
 }
 
+#undef EI_ALIGNBYTES
+
 /* This function is a pseudo-reentrant version of gethostbyname(). It
  * uses locks to serialize the call to the regular (non-reentrant)
  * gethostbyname() and then copies the data into the user-provided
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index bb44b78854..2c4b6e5541 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. 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
@@ -204,15 +205,15 @@ test_ei_decode_misc(Config) when is_list(Config) ->
 
     ?line send_term_as_binary(P,foo),
     ?line send_term_as_binary(P,''),
-    ?line send_term_as_binary(P,'������'),
+    ?line send_term_as_binary(P,'ÅÄÖåäö'),
 
     ?line send_term_as_binary(P,"foo"),
     ?line send_term_as_binary(P,""),
-    ?line send_term_as_binary(P,"������"),
+    ?line send_term_as_binary(P,"ÅÄÖåäö"),
 
     ?line send_term_as_binary(P,<<"foo">>),
     ?line send_term_as_binary(P,<<>>),
-    ?line send_term_as_binary(P,<<"������">>),
+    ?line send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
 %    ?line send_term_as_binary(P,{}),
 %    ?line send_term_as_binary(P,[]),
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index cefd33e5f6..537e9cb01c 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. 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
@@ -213,19 +214,19 @@ test_ei_encode_misc(Config) when is_list(Config) ->
     ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
     ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
     ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,6,"������">>,'������'} = get_buf_and_term(P),
-    ?line {<<100,0,6,"������">>,'������'} = get_buf_and_term(P),
+    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
     ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
     ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
     ?line {<<106>>,""}                    = get_buf_and_term(P),
     ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<107,0,6,"������">>,"������"} = get_buf_and_term(P),
-    ?line {<<107,0,6,"������">>,"������"} = get_buf_and_term(P),
+    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
 
     ?line {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
     ?line {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
-    ?line {<<109,0,0,0,6,"������">>,<<"������">>} = get_buf_and_term(P),
+    ?line {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
 
     ?line {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
     ?line {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index 2a3ed81f53..6305302e28 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. 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
@@ -136,7 +136,7 @@ lists(Config) when is_list(Config) ->
 
 %%    ?line {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = 
 %%	get_term(P),
-    %% kanske regexp i st�llet?
+    %% maybe regexp instead?
     ?line {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
     ?line {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),