2 files changed, 18 insertions, 11 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index 2c47aa06c2..2c86bf5fd1 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -130,9 +130,6 @@
 /* File descriptors are numbers anc consecutively allocated on Unix */
 #define  ERTS_SYS_CONTINOUS_FD_NUMBERS
 
-#define HAVE_ERTS_CHECK_IO_DEBUG
-int erts_check_io_debug(void);
-
 #ifndef ERTS_SMP
 #  undef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
 #  define ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index fdc3167c62..ada62f71f9 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -277,7 +277,7 @@ struct {
     void (*check_io)(int);
     Uint (*size)(void);
     Eterm (*info)(void *);
-    int (*check_io_debug)(void);
+    int (*check_io_debug)(ErtsCheckIoDebugInfo *);
 } io_func = {0};
 
 
@@ -299,9 +299,9 @@ Eterm erts_check_io_info(void *p)
 }
 
 int
-erts_check_io_debug(void)
+erts_check_io_debug(ErtsCheckIoDebugInfo *ip)
 {
-    return (*io_func.check_io_debug)();
+    return (*io_func.check_io_debug)(ip);
 }
 
 
@@ -2489,6 +2489,16 @@ erts_sys_getenv(char *key, char *value, size_t *size)
     return res;
 }
 
+int
+erts_sys_unsetenv(char *key)
+{
+    int res;
+    erts_smp_rwmtx_rwlock(&environ_rwmtx);
+    res = unsetenv(key);
+    erts_smp_rwmtx_rwunlock(&environ_rwmtx);
+    return res;
+}
+
 void
 sys_init_io(void)
 {
@@ -2638,15 +2648,13 @@ int fd;
 }
 
 
-#ifdef DEBUG
-
 extern int erts_initialized;
 void
-erl_assert_error(char* expr, char* file, int line)
+erl_assert_error(const char* expr, const char* func, const char* file, int line)
 {   
     fflush(stdout);
-    fprintf(stderr, "Assertion failed: %s in %s, line %d\n",
-	    expr, file, line);
+    fprintf(stderr, "%s:%d:%s() Assertion failed: %s\n",
+            file, line, func, expr);
     fflush(stderr);
 #if !defined(ERTS_SMP) && 0
     /* Writing a crashdump from a failed assertion when smp support
@@ -2661,6 +2669,8 @@ erl_assert_error(char* expr, char* file, int line)
     abort();
 }
 
+#ifdef DEBUG
+
 void
 erl_debug(char* fmt, ...)
 {