diff options
author | Fredrik Gustafsson <fredrik@erlang.org> | 2013-03-11 12:21:16 +0100 |
---|---|---|
committer | Fredrik Gustafsson <fredrik@erlang.org> | 2013-03-11 12:21:16 +0100 |
commit | 5bc09c6e23f05d8e784af8b79f710d97f345c773 (patch) | |
tree | 92e6cbd9fdbf0cc2000a03a2c2418f1498da990e /lib/erl_interface | |
parent | d2f2eec4231dbac612303e4d9bc4de52fde20ccc (diff) | |
parent | cda401b58a3db7213eb14197680d401fd1399de9 (diff) | |
download | otp-5bc09c6e23f05d8e784af8b79f710d97f345c773.tar.gz otp-5bc09c6e23f05d8e784af8b79f710d97f345c773.tar.bz2 otp-5bc09c6e23f05d8e784af8b79f710d97f345c773.zip |
Merge branch 'maint-r16' into maint
Conflicts:
lib/ssh/src/ssh.appup.src
lib/ssh/test/ssh_sftp_SUITE.erl
Diffstat (limited to 'lib/erl_interface')
-rw-r--r-- | lib/erl_interface/doc/src/notes.xml | 16 | ||||
-rw-r--r-- | lib/erl_interface/include/ei.h | 2 | ||||
-rw-r--r-- | lib/erl_interface/vsn.mk | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml index ae25f0c9ab..4c0267c264 100644 --- a/lib/erl_interface/doc/src/notes.xml +++ b/lib/erl_interface/doc/src/notes.xml @@ -30,6 +30,22 @@ </header> <p>This document describes the changes made to the Erl_interface application.</p> +<section><title>Erl_Interface 3.7.12</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Superfluous trailing comma in enum erlang_char_encoding + causing compile error for g++ with --pedantic option.</p> + <p> + Own Id: OTP-10913 Aux Id: seq12264 </p> + </item> + </list> + </section> + +</section> + <section><title>Erl_Interface 3.7.11</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h index f51f377b9c..9b83385a46 100644 --- a/lib/erl_interface/include/ei.h +++ b/lib/erl_interface/include/ei.h @@ -193,7 +193,7 @@ extern volatile int __erl_errno; typedef enum { ERLANG_ASCII = 1, ERLANG_LATIN1 = 2, - ERLANG_UTF8 = 4, + ERLANG_UTF8 = 4 }erlang_char_encoding; /* a pid */ diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk index 06ea973d9a..9287e105df 100644 --- a/lib/erl_interface/vsn.mk +++ b/lib/erl_interface/vsn.mk @@ -1 +1 @@ -EI_VSN = 3.7.11 +EI_VSN = 3.7.12 |