Merge branch 'bg/remove-stray-ose-support' into dev

* bg/remove-stray-ose-support:
  configure: Remove stray OSE/Delta support
  Makefiles: Remove stray OSE/Delta support
  kernel tests: Remove stray OSE/Delta support
  system tests: Remove stray OSE/Delta support
  erl_interface tests: Remove stray OSE/Delta support
  epmd: Remove stray OSE/Delta support
  epmd: #ifdef out start_epmd() for other platforms than VxWorks
  emulator tests: Remove stray OSE/Delta support
  emulator: Remove stray OSE/Delta support
  emulator: Eliminate #ifdef for sys_tty_reset()
  test_server: Remove stray support for OSE/Delta

OTP-8585 bg/remove-stray-ose-support

1 files changed, 16 insertions, 5 deletions

diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 3194493ac8..46dee826f0 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1996-2010. 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
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 /*
@@ -187,6 +187,17 @@ erts_sys_misc_mem_sz(void)
     return res;
 }
 
+/*
+ * Reset the terminal to the original settings on exit
+ */
+void sys_tty_reset(int exit_code)
+{
+    if (exit_code > 0)
+	ConWaitForExit();
+    else
+	ConNormalExit();
+}
+
 void erl_sys_args(int* argc, char** argv)
 {
     char *event_name;