mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
* 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
This commit is contained in:
parent
d45cfa45ab
commit
817a4e3c83
25 changed files with 43 additions and 32 deletions
6
regenc.h
6
regenc.h
|
@ -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 */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue