4 files changed, 10 insertions, 14 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 50c61f50eb..577554c43d 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2012. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2013. 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
@@ -124,6 +124,7 @@ static char *pluss_val_switches[] = {
     "bwt",
     "cl",
     "ct",
+    "tbt",
     "wt",
     "ws",
     "ss",
@@ -183,7 +184,6 @@ void error(char* format, ...);
 #if !defined(ERTS_HAVE_SMP_EMU)
 static void usage_notsup(const char *switchname);
 #endif
-static void usage_msg(const char *msg);
 static char **build_args_from_env(char *env_var);
 static char **build_args_from_string(char *env_var);
 static void initial_argv_massage(int *argc, char ***argv);
@@ -1131,13 +1131,6 @@ usage_notsup(const char *switchname)
 #endif
 
 static void
-usage_msg(const char *msg)
-{
-    fprintf(stderr, "%s\n", msg);
-    usage_aux();
-}
-
-static void
 usage_format(char *format, ...)
 {
     va_list args;
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 3566406bf3..118bc6ef90 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2007-2012. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2013. 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
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index b9a0e6bde3..bef97862a3 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -2562,7 +2562,8 @@ static void debugf(char *format, ...)
     }
 #else
     /* suppress warning with 'if' */
-    if(write(2,buff,strlen(buff)));
+    if(write(2,buff,strlen(buff)))
+	;
 #endif
     va_end(ap);
 }
@@ -2585,7 +2586,8 @@ static void warning(char *format, ...)
     }
 #else
     /* suppress warning with 'if' */
-    if(write(2,buff,strlen(buff)));
+    if(write(2,buff,strlen(buff)))
+	;
 #endif
     va_end(ap);
 }
@@ -2608,7 +2610,8 @@ static void fatal(char *format, ...)
     }
 #else
     /* suppress warning with 'if' */
-    if(write(2,buff,strlen(buff)));
+    if(write(2,buff,strlen(buff)))
+	;
 #endif
     va_end(ap);
 #ifndef WIN32
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh
index 0d9ba4248d..e75edf3738 100755
--- a/erts/etc/win32/nsis/dll_version_helper.sh
+++ b/erts/etc/win32/nsis/dll_version_helper.sh
@@ -2,7 +2,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2011. All Rights Reserved.
+# Copyright Ericsson AB 2007-2013. 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