diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-27 11:44:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-27 11:44:34 +0200 |
| commit | 74ced1a2b0cbea40c45b41ca52b0191ff3ebfcbf (patch) | |
| tree | 7fea5325f5e84250f361ca89c15f7708890758a0 /erts/epmd/src/epmd_int.h | |
| parent | 4ed9eabf91e2920e52596e134d2b1ccad8724007 (diff) | |
| parent | a6e8634b84f564ec62e44f7c91a1c400af3dd347 (diff) | |
| download | otp-74ced1a2b0cbea40c45b41ca52b0191ff3ebfcbf.tar.gz otp-74ced1a2b0cbea40c45b41ca52b0191ff3ebfcbf.tar.bz2 otp-74ced1a2b0cbea40c45b41ca52b0191ff3ebfcbf.zip | |
Merge branch 'sverker/epmd-vxworks-select-bug/OTP-9427' into dev
* sverker/epmd-vxworks-select-bug/OTP-9427:
Fix epmd crash on vxworks caused by faulty argument to select
Diffstat (limited to 'erts/epmd/src/epmd_int.h')
| -rw-r--r-- | erts/epmd/src/epmd_int.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h index 2a0de4df9c..a2d7559f9d 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -240,6 +240,14 @@ #define put_int16(i, s) {((unsigned char*)(s))[0] = ((i) >> 8) & 0xff; \ ((unsigned char*)(s))[1] = (i) & 0xff;} +#if defined(__GNUC__) +# define EPMD_INLINE __inline__ +#elif defined(__WIN32__) +# define EPMD_INLINE __inline +#else +# define EPMD_INLINE +#endif + /* ************************************************************************ */ /* Stuctures used by server */ @@ -295,6 +303,7 @@ typedef struct { unsigned delay_write; int max_conn; int active_conn; + int select_fd_top; char *progname; Connection *conn; Nodes nodes; |