From 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Thu, 31 May 2012 15:32:38 +0900 Subject: resolve conflict --- src/encoding.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/encoding.h') diff --git a/src/encoding.h b/src/encoding.h index c6c470644..1312fb947 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -174,11 +174,7 @@ int mrb_enc_codelen(mrb_state *mrb, int code, mrb_encoding *enc); #endif //INCLUDE_ENCODING /* code,ptr,encoding -> write buf */ -#ifdef INCLUDE_ENCODING -#define mrb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)(buf)) -#else -#define mrb_enc_mbcput(c,buf,enc) *(buf) = (char)(c) -#endif //INCLUDE_ENCODING +#define mrb_enc_mbcput(c,buf,enc) ((*(buf) = (char)(c)),1) /* start, ptr, end, encoding -> prev_char */ #define mrb_enc_prev_char(s,p,e,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) @@ -232,9 +228,6 @@ mrb_value mrb_enc_default_internal(mrb_state *mrb); void mrb_enc_set_default_external(mrb_state *mrb, mrb_value encoding); void mrb_enc_set_default_internal(mrb_state *mrb, mrb_value encoding); mrb_value mrb_locale_charmap(mrb_state *mrb, mrb_value klass); -#ifdef INCLUDE_ENCODING -int mrb_memsearch(mrb_state *mrb, const void*,int,const void*,int,mrb_encoding*); -#endif //INCLUDE_ENCODING mrb_value mrb_usascii_str_new_cstr(mrb_state *mrb, const char *ptr); int mrb_str_buf_cat_escaped_char(mrb_state *mrb, mrb_value result, unsigned int c, int unicode_p); -- cgit v1.2.3