aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/doc/src/ei.xml
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-01-03 16:16:54 +0100
committerBjörn-Egil Dahlberg <[email protected]>2011-01-03 16:16:54 +0100
commit095d5ebc0f739982b55b95fdd9919a6331b4b2b1 (patch)
tree4103f7ed11c37b97fbfe144d75546ae4f661fb49 /lib/erl_interface/doc/src/ei.xml
parent99372cc4053c2fa7662da2f871c9813fbf45ba7e (diff)
parentbcbe0813a0b97f86a7db354e09bf0397cf68f787 (diff)
downloadotp-095d5ebc0f739982b55b95fdd9919a6331b4b2b1.tar.gz
otp-095d5ebc0f739982b55b95fdd9919a6331b4b2b1.tar.bz2
otp-095d5ebc0f739982b55b95fdd9919a6331b4b2b1.zip
Merge branch 'vb/ei-exts' into dev
* vb/ei-exts: Fix testcases erl_global_whereis, erl_global_names Fix wrong erl_compare_ext result comparing lists Correct erl_global{register, unregister} functions Add PID (~p) type parameters to ei_format Add char (~c) type parameters to ei_format OTP-9015 Conflicts: lib/erl_interface/include/ei.h
Diffstat (limited to 'lib/erl_interface/doc/src/ei.xml')
-rw-r--r--lib/erl_interface/doc/src/ei.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index d7af7a1b67..de4e4b4301 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -641,12 +641,14 @@ ei_x_encode_empty_list(&amp;x);
<p></p>
<pre>
~a - an atom, char*
+~c - a character, char
~s - a string, char*
~i - an integer, int
~l - a long integer, long int
~u - a unsigned long integer, unsigned long int
~f - a float, float
~d - a double float, double float
+~p - an Erlang PID, erlang_pid*
</pre>
<p>For instance, to encode a tuple with some stuff:</p>
<pre>