diff options
| author | Rickard Green <[email protected]> | 2019-02-06 16:02:43 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-02-06 16:02:43 +0100 |
| commit | 260935595647eb2c4ca94c4c853c2b6065610272 (patch) | |
| tree | 525644c57692fc2422c6cbf8f3e31647590007ed /lib/erl_interface/include | |
| parent | 3542afbdc4909455ad9e45e2b5328835a838a1bd (diff) | |
| parent | 2a1dab38c8a2186a7413eabb2035234cb66f367f (diff) | |
| download | otp-260935595647eb2c4ca94c4c853c2b6065610272.tar.gz otp-260935595647eb2c4ca94c4c853c2b6065610272.tar.bz2 otp-260935595647eb2c4ca94c4c853c2b6065610272.zip | |
Merge branch 'maint'
* maint:
Introduce ei_init()
Fix bug in ei_accept_tmo
Fix build of erl_interface on BSD
Diffstat (limited to 'lib/erl_interface/include')
| -rw-r--r-- | lib/erl_interface/include/ei.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h index 92674571e2..ca4960b252 100644 --- a/lib/erl_interface/include/ei.h +++ b/lib/erl_interface/include/ei.h @@ -36,6 +36,8 @@ #include <windows.h> #include <winbase.h> typedef LONG_PTR ssize_t; /* Sigh... */ +#else +#include <sys/types.h> /* ssize_t */ #endif #include <stdio.h> /* Need type FILE */ @@ -667,6 +669,8 @@ struct ei_reg_tabstat { }; +int ei_init(void); + /* -------------------------------------------------------------------- */ /* XXXXXXXXXXX */ /* -------------------------------------------------------------------- */ |