Merge branch 'sverk/master/halt-INT_MIN'

* sverk/master/halt-INT_MIN:
  erts: Make erlang:halt() accept bignums as Status
  erts: Change erl_exit into erts_exit
  kernel: Remove calls to erl_exit

1 files changed, 2 insertions, 2 deletions

diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c
index 0d63d46698..7fe708dc7b 100644
--- a/erts/emulator/drivers/win32/win_con.c
+++ b/erts/emulator/drivers/win32/win_con.c
@@ -279,7 +279,7 @@ ConInit(void)
 }
 
 /*
-  ConNormalExit() is called from erl_exit() when the emulator
+  ConNormalExit() is called from erts_exit() when the emulator
   is stopping. If the exit has not been initiated by this 
   console thread (WM_DESTROY or ID_BREAK), the function must 
   invoke the console thread to save the user preferences.
@@ -529,7 +529,7 @@ ConThreadInit(LPVOID param)
     /*
        PostQuitMessage() results in WM_QUIT which makes GetMessage()
        return 0 (which stops the main loop). Before we return from
-       the console thread, the ctrl_handler is called to do erl_exit. 
+       the console thread, the ctrl_handler is called to do erts_exit.
     */
     (*ctrl_handler)(CTRL_CLOSE_EVENT);
     return msg.wParam;