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/src/Makefile.in | |
| 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/src/Makefile.in')
| -rw-r--r-- | lib/erl_interface/src/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index 24ead76afb..b0bb9bfadf 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -416,7 +416,8 @@ MISCSRC = \ misc/eimd5.c \ misc/get_type.c \ misc/show_msg.c \ - misc/ei_compat.c + misc/ei_compat.c \ + misc/ei_init.c REGISTRYSRC = \ registry/hash_dohash.c \ |