aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-03-08 09:35:31 +0100
committerErlang/OTP <[email protected]>2013-03-08 09:35:31 +0100
commit897f7a65e0475a7a215adb27423adc04db7d47c6 (patch)
tree3e47f6c4965d1289b7412cb0be8339445d27f473 /lib
parent05f11890bdfec4bfc3a78e191a87e70a937ffc54 (diff)
parent67a1a8e0d68207e8d831963c8f235988feefcf61 (diff)
downloadotp-897f7a65e0475a7a215adb27423adc04db7d47c6.tar.gz
otp-897f7a65e0475a7a215adb27423adc04db7d47c6.tar.bz2
otp-897f7a65e0475a7a215adb27423adc04db7d47c6.zip
Merge branch 'sverk/erl_interface-trailing-enum-comma' into maint-r16
* sverk/erl_interface-trailing-enum-comma: erl_interface: Remove superfluous comma in enum erlang_char_encoding
Diffstat (limited to 'lib')
-rw-r--r--lib/erl_interface/include/ei.h2
1 files changed, 1 insertions, 1 deletions
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 */