diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-07-16 18:18:22 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-07-18 18:57:53 +0200 |
| commit | 817eeaf7777af901110d5da8c73006abdfa9be6a (patch) | |
| tree | 1187080bdbb95891e69e7981d7a8fabc6239dde9 /erts/emulator/sys | |
| parent | 075ecdf8d78876d994b5e441e0da158a8cbd9898 (diff) | |
| download | otp-817eeaf7777af901110d5da8c73006abdfa9be6a.tar.gz otp-817eeaf7777af901110d5da8c73006abdfa9be6a.tar.bz2 otp-817eeaf7777af901110d5da8c73006abdfa9be6a.zip | |
erts: Remove VxWorks support from beam
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 5a8588351d..b0eaf14d90 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -55,17 +55,12 @@ # ifdef SYS_SELECT_H # include <sys/select.h> # endif -# ifdef VXWORKS -# include <selectLib.h> -# endif #endif -#ifndef VXWORKS -# ifdef NO_SYSCONF -# if ERTS_POLL_USE_SELECT -# include <sys/param.h> -# else -# include <limits.h> -# endif +#ifdef NO_SYSCONF +# if ERTS_POLL_USE_SELECT +# include <sys/param.h> +# else +# include <limits.h> # endif #endif #include "erl_thr_progress.h" @@ -2222,10 +2217,6 @@ ERTS_POLL_EXPORT(erts_poll_max_fds)(void) * --- Initialization -------------------------------------------------------- */ -#ifdef VXWORKS -extern int erts_vxworks_max_files; -#endif - void ERTS_POLL_EXPORT(erts_poll_init)(void) { @@ -2234,9 +2225,7 @@ ERTS_POLL_EXPORT(erts_poll_init)(void) errno = 0; -#if defined(VXWORKS) - max_fds = erts_vxworks_max_files; -#elif !defined(NO_SYSCONF) +#if !defined(NO_SYSCONF) max_fds = sysconf(_SC_OPEN_MAX); #elif ERTS_POLL_USE_SELECT max_fds = NOFILE; |