diff options
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 | ||||
| -rw-r--r-- | lib/.gitignore | 7 | ||||
| -rw-r--r-- | lib/erl_interface/src/misc/ei_internal.h | 2 | ||||
| -rw-r--r-- | system/doc/reference_manual/modules.xml | 15 |
4 files changed, 25 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index b7b577da5b..c6e23ee647 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -1205,8 +1205,8 @@ static void *realloc_wrapper(void *current, size_t size){ /* For AssocID, 4 bytes should be enough -- checked by "init": */ # define GET_ASSOC_ID get_int32 # define ASSOC_ID_LEN 4 -# define LOAD_ASSOC_ID LOAD_INT -# define LOAD_ASSOC_ID_CNT LOAD_INT_CNT +# define LOAD_ASSOC_ID LOAD_UINT +# define LOAD_ASSOC_ID_CNT LOAD_UINT_CNT # define SCTP_ANC_BUFF_SIZE INET_DEF_BUFFER/2 /* XXX: not very good... */ #endif diff --git a/lib/.gitignore b/lib/.gitignore index bdc850f3b7..0cb938ea7c 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,3 +1,10 @@ +# erl_interface + +/erl_interface/bin +/erl_interface/obj.mt +/erl_interface/obj.st +/erl_interface/obj + # megaco /megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.erl diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h index 9f51d1f61b..f7805efebf 100644 --- a/lib/erl_interface/src/misc/ei_internal.h +++ b/lib/erl_interface/src/misc/ei_internal.h @@ -149,7 +149,7 @@ {if (ei_tracelevel >= 5) ei_trace_printf(NAME,1,FORMAT,ARG1,ARG2,ARG3,ARG4, \ ARG5,ARG6,ARG7);} -int ei_tracelevel; +extern int ei_tracelevel; void ei_trace_printf(const char *name, int level, const char *format, ...); diff --git a/system/doc/reference_manual/modules.xml b/system/doc/reference_manual/modules.xml index 8b14ca3459..f4885be480 100644 --- a/system/doc/reference_manual/modules.xml +++ b/system/doc/reference_manual/modules.xml @@ -167,6 +167,21 @@ fact(0) -> % | the original user-written file from which the source program was produced.</p> </section> + + <section> + <title>Types and function specifications</title> + <p>The current release implements types and function specifications + as described in + <url href="http://www.erlang.org/eeps/eep-0008.html">EEP8 - +Types and function specifications</url>. + + <note> + <p>The implementation and EEP8 may not exactly correspond to + each other. In a future release, type and function specifications + will be described in this reference manual.</p> + </note> + </p> + </section> </section> <section> |