diff options
author | Erlang/OTP <[email protected]> | 2010-05-02 08:30:50 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-05-02 08:30:50 +0000 |
commit | 3a68c36ca7aed71d643ea29460e36fec7e56817d (patch) | |
tree | 0899b533f3076b55368ba6aa9710172db8a22a4f /erts/emulator/beam/beam_emu.c | |
parent | c7a4c9375a7236826c5c31927f60e72684f6a230 (diff) | |
parent | e5c6b79fba89208f0d293ad69f5fd802931c08e2 (diff) | |
download | otp-3a68c36ca7aed71d643ea29460e36fec7e56817d.tar.gz otp-3a68c36ca7aed71d643ea29460e36fec7e56817d.tar.bz2 otp-3a68c36ca7aed71d643ea29460e36fec7e56817d.zip |
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
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
-rw-r--r-- | erts/emulator/beam/beam_emu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index b21fd3038f..5b2f032afc 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1003,14 +1003,14 @@ static BeamInstr* call_fun(Process* p, int arity, Eterm* reg, Eterm args); static BeamInstr* apply_fun(Process* p, Eterm fun, Eterm args, Eterm* reg); static Eterm new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free); -#if defined(_OSE_) || defined(VXWORKS) +#if defined(VXWORKS) static int init_done; #endif void init_emulator(void) { -#if defined(_OSE_) || defined(VXWORKS) +#if defined(VXWORKS) init_done = 0; #endif process_main(); @@ -1049,7 +1049,7 @@ init_emulator(void) */ void process_main(void) { -#if !defined(_OSE_) && !defined(VXWORKS) +#if !defined(VXWORKS) static int init_done = 0; #endif Process* c_p = NULL; |