From 23a32d6444cea5b1719edc42d63911e108d3086e Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 30 Jun 2009 02:08:54 +0000 Subject: * include/ruby/oniguruma.h, include/ruby/re.h, re.c, regcomp.c, regenc.c, regerror.c, regexec.c, regint.h, regparse.c: use long. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/oniguruma.h | 6 +++--- include/ruby/re.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h index a8fa62208f..34707d2693 100644 --- a/include/ruby/oniguruma.h +++ b/include/ruby/oniguruma.h @@ -106,7 +106,7 @@ extern "C" { typedef unsigned char OnigUChar; typedef unsigned int OnigCodePoint; typedef unsigned int OnigCtype; -typedef unsigned int OnigDistance; +typedef size_t OnigDistance; #define ONIG_INFINITE_DISTANCE ~((OnigDistance )0) @@ -692,9 +692,9 @@ int onig_recompile P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pat ONIG_EXTERN int onig_recompile_deluxe P_((OnigRegex reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo)); ONIG_EXTERN -int onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option)); +long onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option)); ONIG_EXTERN -int onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option)); +long onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option)); ONIG_EXTERN OnigRegion* onig_region_new P_((void)); ONIG_EXTERN diff --git a/include/ruby/re.h b/include/ruby/re.h index cc7f6025a7..c60ab96016 100644 --- a/include/ruby/re.h +++ b/include/ruby/re.h @@ -27,8 +27,8 @@ extern "C" { typedef struct re_pattern_buffer Regexp; struct rmatch_offset { - int beg; - int end; + long beg; + long end; }; struct rmatch { @@ -50,9 +50,9 @@ struct RMatch { #define RMATCH_REGS(obj) (&(R_CAST(RMatch)(obj))->rmatch->regs) VALUE rb_reg_regcomp(VALUE); -int rb_reg_search(VALUE, VALUE, int, int); +long rb_reg_search(VALUE, VALUE, long, int); VALUE rb_reg_regsub(VALUE, VALUE, struct re_registers *, VALUE); -int rb_reg_adjust_startpos(VALUE, VALUE, int, int); +long rb_reg_adjust_startpos(VALUE, VALUE, long, int); void rb_match_busy(VALUE); VALUE rb_reg_quote(VALUE); -- cgit v1.2.3