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/epmd/src/epmd_int.h | |
| 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/epmd/src/epmd_int.h')
| -rw-r--r-- | erts/epmd/src/epmd_int.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h index 0e432e2cb0..84578c72f8 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -37,19 +37,6 @@ #define DONT_USE_MAIN #endif -#ifdef _OSE_ -#define NO_SYSLOG -#define NO_SYSCONF -#define NO_DAEMON -#define DONT_USE_MAIN -#ifndef HAVE_SYS_TIME_H -#define HAVE_SYS_TIME_H -#endif -#ifndef HAVE_UNISTD_H -#define HAVE_UNISTD_H -#endif -#endif - /* ************************************************************************ */ /* Standard includes */ @@ -92,7 +79,7 @@ #endif #endif /* ! VXWORKS */ -#if (!defined(__WIN32__) && !defined(_OSE_)) +#if !defined(__WIN32__) # include <netinet/in.h> # include <sys/socket.h> # include <sys/stat.h> @@ -105,10 +92,8 @@ # include <netinet/tcp.h> #endif /* ! WIN32 */ -#ifndef _OSE_ #include <ctype.h> #include <signal.h> -#endif #include <errno.h> @@ -126,13 +111,6 @@ #include <stdarg.h> -#ifdef _OSE_ -# include "ose.h" -# include "inet.h" -# include "sys/stat.h" -#endif - - /* ************************************************************************ */ /* Replace some functions by others by making the function name a macro */ @@ -148,10 +126,6 @@ #define sleep(n) taskDelay((n) * sysClkRateGet()) #endif /* VXWORKS */ -#ifdef _OSE_ -#define sleep(n) delay((n)) -#endif - #ifdef USE_BCOPY # define memcpy(a, b, c) bcopy((b), (a), (c)) # define memcmp(a, b, c) bcmp((a), (b), (c)) |