diff options
Diffstat (limited to 'transcode_data.h')
| -rw-r--r-- | transcode_data.h | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/transcode_data.h b/transcode_data.h index 8e85ce6db4..416e50d3cc 100644 --- a/transcode_data.h +++ b/transcode_data.h @@ -1,3 +1,5 @@ +#ifndef RUBY_TRANSCODE_DATA_H +#define RUBY_TRANSCODE_DATA_H 1 /********************************************************************** transcode_data.h - @@ -11,12 +13,7 @@ #include "ruby/ruby.h" -#ifndef RUBY_TRANSCODE_DATA_H -#define RUBY_TRANSCODE_DATA_H 1 - -#if defined __GNUC__ && __GNUC__ >= 4 -#pragma GCC visibility push(default) -#endif +RUBY_SYMBOL_EXPORT_BEGIN #define WORDINDEX_SHIFT_BITS 2 #define WORDINDEX2INFO(widx) ((widx) << WORDINDEX_SHIFT_BITS) @@ -48,10 +45,26 @@ #define makeSTR1LEN(len) ((len)-4) #define o1(b1) (PType((((unsigned char)(b1))<<8)|ONEbt)) -#define o2(b1,b2) (PType((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|TWObt)) -#define o3(b1,b2,b3) (PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned int)(unsigned char)(b3))<<24)|THREEbt)&0xffffffffU)) -#define o4(b0,b1,b2,b3) (PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt)&0xffffffffU)) -#define g4(b0,b1,b2,b3) (PType(((((unsigned char)(b0))<<8)|(((unsigned char)(b2))<<16)|((((unsigned char)(b1))&0x0f)<<24)|((((unsigned int)(unsigned char)(b3))&0x0f)<<28)|GB4bt)&0xffffffffU)) +#define o2(b1,b2) (PType((((unsigned char)(b1))<<8)|\ + (((unsigned char)(b2))<<16)|\ + TWObt)) +#define o3(b1,b2,b3) (PType(((((unsigned char)(b1))<<8)|\ + (((unsigned char)(b2))<<16)|\ + (((unsigned int)(unsigned char)(b3))<<24)|\ + THREEbt)&\ + 0xffffffffU)) +#define o4(b0,b1,b2,b3) (PType(((((unsigned char)(b1))<<8)|\ + (((unsigned char)(b2))<<16)|\ + (((unsigned int)(unsigned char)(b3))<<24)|\ + ((((unsigned char)(b0))&0x07)<<5)|\ + FOURbt)&\ + 0xffffffffU)) +#define g4(b0,b1,b2,b3) (PType(((((unsigned char)(b0))<<8)|\ + (((unsigned char)(b2))<<16)|\ + ((((unsigned char)(b1))&0x0f)<<24)|\ + ((((unsigned int)(unsigned char)(b3))&0x0f)<<28)|\ + GB4bt)&\ + 0xffffffffU)) #define funsio(diff) (PType((((unsigned int)(diff))<<8)|FUNsio)) #define getBT1(a) ((unsigned char)((a)>> 8)) @@ -72,9 +85,9 @@ #define THREETRAIL /* legal but undefined if three more trailing UTF-8 */ typedef enum { - asciicompat_converter, /* ASCII-compatible -> ASCII-compatible */ - asciicompat_decoder, /* ASCII-incompatible -> ASCII-compatible */ - asciicompat_encoder /* ASCII-compatible -> ASCII-incompatible */ + asciicompat_converter, /* ASCII-compatible -> ASCII-compatible */ + asciicompat_decoder, /* ASCII-incompatible -> ASCII-compatible */ + asciicompat_encoder /* ASCII-compatible -> ASCII-incompatible */ /* ASCII-incompatible -> ASCII-incompatible is intentionally omitted. */ } rb_transcoder_asciicompat_type_t; @@ -110,8 +123,16 @@ struct rb_transcoder { void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib); void rb_register_transcoder(const rb_transcoder *); -#if defined __GNUC__ && __GNUC__ >= 4 -#pragma GCC visibility pop +/* + * To get rid of collision of initializer symbols in statically-linked encodings + * and transcoders + */ +#if defined(EXTSTATIC) && EXTSTATIC +# define TRANS_INIT(name) void Init_trans_ ## name(void) +#else +# define TRANS_INIT(name) void Init_ ## name(void) #endif +RUBY_SYMBOL_EXPORT_END + #endif /* RUBY_TRANSCODE_DATA_H */ |