diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 02:23:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 02:23:26 +0000 |
| commit | 817a4e3c83fd830b93c286159e97a18654db1c35 (patch) | |
| tree | 288cbc4b1403f7a4d9b891329e830a2a6871fa57 /regenc.h | |
| parent | d45cfa45ab62ac9e31c20d5bdf4926bf7748df8f (diff) | |
* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
* encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
* regenc.h (OnigEncodingDefine): names of extension and encoding can
differ.
* enc/Makefile.in: always shared.
* enc/depend (deffile): should not upcase.
* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regenc.h')
| -rw-r--r-- | regenc.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -181,9 +181,9 @@ ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[]; extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*); #define OnigEncodingName(n) encoding_##n #define OnigEncodingDeclare(n) static OnigEncodingType OnigEncodingName(n) -#define OnigEncodingDefine(n) \ +#define OnigEncodingDefine(f,n) \ OnigEncodingDeclare(n); \ - void Init_##n(void) { \ + void Init_##f(void) { \ ONIG_ENC_REGISTER(OnigEncodingName(n).name, \ &OnigEncodingName(n)); \ } \ @@ -191,7 +191,7 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*); #else #define OnigEncodingName(n) OnigEncoding##n #define OnigEncodingDeclare(n) OnigEncodingType OnigEncodingName(n) -#define OnigEncodingDefine(n) OnigEncodingDeclare(n) +#define OnigEncodingDefine(f,n) OnigEncodingDeclare(n) #endif #endif /* REGENC_H */ |