diff options
| author | Björn Gustavsson <[email protected]> | 2010-04-03 10:47:12 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-04-30 06:16:01 +0200 |
| commit | 8ebf6ffa5da382dee33fd062785056986bdcf6f2 (patch) | |
| tree | 8e1551a39d34eace1f9ea24171728689348d2629 /erts/emulator/beam | |
| parent | ccc18513ab58762d2ba857ff88b22f6633afa4af (diff) | |
| download | otp-8ebf6ffa5da382dee33fd062785056986bdcf6f2.tar.gz otp-8ebf6ffa5da382dee33fd062785056986bdcf6f2.tar.bz2 otp-8ebf6ffa5da382dee33fd062785056986bdcf6f2.zip | |
emulator: Eliminate #ifdef for sys_tty_reset()
In the erts/emulator/beam sources
#ifdef SOME_OPERATING_SYSTEM
should be avoided. Instead, call a function implemented in
sys/OPERATING_SYSTEM/sys.c.
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 16 | ||||
| -rw-r--r-- | erts/emulator/beam/sys.h | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 41cfcd74aa..5a7e0649c9 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -1453,13 +1453,7 @@ __decl_noreturn void erl_exit0(char *file, int line, int n, char *fmt,...) if (fmt != NULL && *fmt != '\0') erl_error(fmt, args); /* Print error message. */ va_end(args); -#ifdef __WIN32__ - if(n > 0) ConWaitForExit(); - else ConNormalExit(); -#endif -#if !defined(__WIN32__) && !defined(VXWORKS) && !defined(_OSE_) - sys_tty_reset(); -#endif + sys_tty_reset(n); if (n == ERTS_INTR_EXIT) exit(0); @@ -1499,13 +1493,7 @@ __decl_noreturn void erl_exit(int n, char *fmt,...) if (fmt != NULL && *fmt != '\0') erl_error(fmt, args); /* Print error message. */ va_end(args); -#ifdef __WIN32__ - if(n > 0) ConWaitForExit(); - else ConNormalExit(); -#endif -#if !defined(__WIN32__) && !defined(VXWORKS) && !defined(_OSE_) - sys_tty_reset(); -#endif + sys_tty_reset(n); if (n == ERTS_INTR_EXIT) exit(0); diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index a86bcb80dd..1998a2bc9f 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -686,7 +686,7 @@ extern void erl_sys_schedule(int); #ifdef _OSE_ extern void erl_sys_init_final(void); #else -void sys_tty_reset(void); +void sys_tty_reset(int); #endif EXTERN_FUNCTION(int, sys_max_files, (_VOID_)); |