diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-07-25 15:00:32 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-07-25 15:00:32 +0200 |
commit | a7bcc6aa05bc61edd1ac178b6331e780aeab940f (patch) | |
tree | af6cb90b11c95744135e233478c89b55fede8bf7 /lib/kernel/test/heart_SUITE_data/simple_echo.c | |
parent | 81664b189c21710767b78a9db9d74d55585cfeed (diff) | |
parent | 84bc4fb47b58f258a50e23ba96db51608272b859 (diff) | |
download | otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.gz otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.bz2 otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.zip |
Merge branch 'egil/r16/remove-vxworks-support/OTP-10146'
* egil/r16/remove-vxworks-support/OTP-10146: (30 commits)
erts: Update doc to reflect VxWorks removal
erts: Remove VxWorks from documentation
Update preloaded erl_prim_loader and prim_file
snmp: Remove VxWorks
megaco: Remove VxWorks
diameter: Remove VxWorks
mnesia: Remove VxWorks
typer: Remove VxWorks
ssh: Remove VxWorks
inets: Remove VxWorks
hipe: Remove VxWorks
cosFileTransfer: Remove VxWorks
asn1: Remove VxWorks
orber: Remove VxWorks
os_mon: Remove VxWorks
runtime_tools: Remove VxWorks
test_server: Remove VxWorks references in doc
test_server: Remove VxWorks
stdlib: Remove VxWorks
kernel: Remove VxWorks from tests
...
Conflicts:
erts/emulator/test/Makefile
Diffstat (limited to 'lib/kernel/test/heart_SUITE_data/simple_echo.c')
-rw-r--r-- | lib/kernel/test/heart_SUITE_data/simple_echo.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/kernel/test/heart_SUITE_data/simple_echo.c b/lib/kernel/test/heart_SUITE_data/simple_echo.c index 0093dbce9b..a92bb8af95 100644 --- a/lib/kernel/test/heart_SUITE_data/simple_echo.c +++ b/lib/kernel/test/heart_SUITE_data/simple_echo.c @@ -2,11 +2,7 @@ #include <stdlib.h> #include <string.h> -#ifdef VXWORKS -int simple_echo(void){ -#else int main(void){ -#endif int x; while((x = getchar()) != EOF){ putchar(x); @@ -14,4 +10,3 @@ int main(void){ } return 0; } - |