From 53cffba8cb3ee3e38eaed5b5679d9bdc5bc8a11e Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 1 Jul 2008 08:39:10 +0000 Subject: * enc/ascii.c: ISO C does not allow extra ';' outside of a function * enc/us_ascii.c: ditto. * enc/utf_8.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++- enc/ascii.c | 88 +++++++++++++++++++++++++++++----------------------------- enc/us_ascii.c | 6 ++-- enc/utf_8.c | 6 ++-- 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfadd673c5..b88ac30502 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ -Tue Jul 1 17:30:30 2008 URABE Shyouhei +Tue Jul 1 17:37:43 2008 URABE Shyouhei + + * enc/ascii.c: ISO C does not allow extra ';' outside of a + function + + * enc/us_ascii.c: ditto. + + * enc/utf_8.c: ditto. * process.c (run_exec_rlimit): ISO C90 forbids mixed declarations and code diff --git a/enc/ascii.c b/enc/ascii.c index a74dcb0ec7..3d62ec9bf7 100644 --- a/enc/ascii.c +++ b/enc/ascii.c @@ -47,47 +47,47 @@ OnigEncodingDefine(ascii, ASCII) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; -ENC_ALIAS("BINARY", "ASCII-8BIT"); -ENC_REPLICATE("IBM437", "ASCII-8BIT"); -ENC_ALIAS("CP437", "IBM437"); -ENC_REPLICATE("IBM737", "ASCII-8BIT"); -ENC_ALIAS("CP737", "IBM737"); -ENC_REPLICATE("IBM775", "ASCII-8BIT"); -ENC_ALIAS("CP775", "IBM775"); -ENC_REPLICATE("CP850", "ASCII-8BIT"); -ENC_ALIAS("IBM850", "CP850"); -ENC_REPLICATE("IBM852", "ASCII-8BIT"); -ENC_REPLICATE("CP852", "IBM852"); -ENC_REPLICATE("IBM855", "ASCII-8BIT"); -ENC_REPLICATE("CP855", "IBM855"); -ENC_REPLICATE("IBM857", "ASCII-8BIT"); -ENC_ALIAS("CP857", "IBM857"); -ENC_REPLICATE("IBM860", "ASCII-8BIT"); -ENC_ALIAS("CP860", "IBM860"); -ENC_REPLICATE("IBM861", "ASCII-8BIT"); -ENC_ALIAS("CP861", "IBM861"); -ENC_REPLICATE("IBM862", "ASCII-8BIT"); -ENC_ALIAS("CP862", "IBM862"); -ENC_REPLICATE("IBM863", "ASCII-8BIT"); -ENC_ALIAS("CP863", "IBM863"); -ENC_REPLICATE("IBM864", "ASCII-8BIT"); -ENC_ALIAS("CP864", "IBM864"); -ENC_REPLICATE("IBM865", "ASCII-8BIT"); -ENC_ALIAS("CP865", "IBM865"); -ENC_REPLICATE("IBM866", "ASCII-8BIT"); -ENC_ALIAS("CP866", "IBM866"); -ENC_REPLICATE("IBM869", "ASCII-8BIT"); -ENC_ALIAS("CP869", "IBM869"); -ENC_REPLICATE("Windows-1258", "ASCII-8BIT"); -ENC_ALIAS("CP1258", "Windows-1258"); -ENC_REPLICATE("GB1988", "ASCII-8BIT"); -ENC_REPLICATE("macCentEuro", "ASCII-8BIT"); -ENC_REPLICATE("macCroatian", "ASCII-8BIT"); -ENC_REPLICATE("macCyrillic", "ASCII-8BIT"); -ENC_REPLICATE("macGreek", "ASCII-8BIT"); -ENC_REPLICATE("macIceland", "ASCII-8BIT"); -ENC_REPLICATE("macRoman", "ASCII-8BIT"); -ENC_REPLICATE("macRomania", "ASCII-8BIT"); -ENC_REPLICATE("macThai", "ASCII-8BIT"); -ENC_REPLICATE("macTurkish", "ASCII-8BIT"); -ENC_REPLICATE("macUkraine", "ASCII-8BIT"); +ENC_ALIAS("BINARY", "ASCII-8BIT") +ENC_REPLICATE("IBM437", "ASCII-8BIT") +ENC_ALIAS("CP437", "IBM437") +ENC_REPLICATE("IBM737", "ASCII-8BIT") +ENC_ALIAS("CP737", "IBM737") +ENC_REPLICATE("IBM775", "ASCII-8BIT") +ENC_ALIAS("CP775", "IBM775") +ENC_REPLICATE("CP850", "ASCII-8BIT") +ENC_ALIAS("IBM850", "CP850") +ENC_REPLICATE("IBM852", "ASCII-8BIT") +ENC_REPLICATE("CP852", "IBM852") +ENC_REPLICATE("IBM855", "ASCII-8BIT") +ENC_REPLICATE("CP855", "IBM855") +ENC_REPLICATE("IBM857", "ASCII-8BIT") +ENC_ALIAS("CP857", "IBM857") +ENC_REPLICATE("IBM860", "ASCII-8BIT") +ENC_ALIAS("CP860", "IBM860") +ENC_REPLICATE("IBM861", "ASCII-8BIT") +ENC_ALIAS("CP861", "IBM861") +ENC_REPLICATE("IBM862", "ASCII-8BIT") +ENC_ALIAS("CP862", "IBM862") +ENC_REPLICATE("IBM863", "ASCII-8BIT") +ENC_ALIAS("CP863", "IBM863") +ENC_REPLICATE("IBM864", "ASCII-8BIT") +ENC_ALIAS("CP864", "IBM864") +ENC_REPLICATE("IBM865", "ASCII-8BIT") +ENC_ALIAS("CP865", "IBM865") +ENC_REPLICATE("IBM866", "ASCII-8BIT") +ENC_ALIAS("CP866", "IBM866") +ENC_REPLICATE("IBM869", "ASCII-8BIT") +ENC_ALIAS("CP869", "IBM869") +ENC_REPLICATE("Windows-1258", "ASCII-8BIT") +ENC_ALIAS("CP1258", "Windows-1258") +ENC_REPLICATE("GB1988", "ASCII-8BIT") +ENC_REPLICATE("macCentEuro", "ASCII-8BIT") +ENC_REPLICATE("macCroatian", "ASCII-8BIT") +ENC_REPLICATE("macCyrillic", "ASCII-8BIT") +ENC_REPLICATE("macGreek", "ASCII-8BIT") +ENC_REPLICATE("macIceland", "ASCII-8BIT") +ENC_REPLICATE("macRoman", "ASCII-8BIT") +ENC_REPLICATE("macRomania", "ASCII-8BIT") +ENC_REPLICATE("macThai", "ASCII-8BIT") +ENC_REPLICATE("macTurkish", "ASCII-8BIT") +ENC_REPLICATE("macUkraine", "ASCII-8BIT") diff --git a/enc/us_ascii.c b/enc/us_ascii.c index 8a18966ee3..39e2b26088 100644 --- a/enc/us_ascii.c +++ b/enc/us_ascii.c @@ -26,6 +26,6 @@ OnigEncodingDefine(us_ascii, US_ASCII) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; -ENC_ALIAS("ASCII", "US-ASCII"); -ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII"); -ENC_ALIAS("646", "US-ASCII"); +ENC_ALIAS("ASCII", "US-ASCII") +ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII") +ENC_ALIAS("646", "US-ASCII") diff --git a/enc/utf_8.c b/enc/utf_8.c index 4eaf6a21e7..b8ee92feb4 100644 --- a/enc/utf_8.c +++ b/enc/utf_8.c @@ -442,7 +442,7 @@ OnigEncodingDefine(utf_8, UTF_8) = { left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; -ENC_ALIAS("CP65001", "UTF-8"); +ENC_ALIAS("CP65001", "UTF-8") /* * Name: UTF8-MAC @@ -450,6 +450,6 @@ ENC_ALIAS("CP65001", "UTF-8"); * Link: http://developer.apple.com/qa/qa2001/qa1235.html * Link: http://developer.apple.com/jp/qa/qa2001/qa1235.html */ -ENC_REPLICATE("UTF8-MAC", "UTF-8"); -ENC_ALIAS("UTF-8-MAC", "UTF8-MAC"); +ENC_REPLICATE("UTF8-MAC", "UTF-8") +ENC_ALIAS("UTF-8-MAC", "UTF8-MAC") -- cgit v1.2.3