From: K.Kosako Date: Fri, 15 Feb 2019 00:56:14 +0000 (+0900) Subject: escape compile errors and warnings in Windows X-Git-Tag: v6.9.2_rc1~65^2~53 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ab699ac02bd8412f556d67d2532da03b3bc04f5;p=onig escape compile errors and warnings in Windows --- diff --git a/src/regcomp.c b/src/regcomp.c index 5878f74..b24df65 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -180,7 +180,7 @@ ops_free(regex_t* reg) if (IS_NULL(reg->ops)) return ; - for (i = 0; i < reg->ops_used; i++) { + for (i = 0; i < (int )reg->ops_used; i++) { Operation* op = reg->ops + i; switch (op->opcode) { case OP_EXACTMBN: @@ -2154,7 +2154,7 @@ fix_unset_addr_list(UnsetAddrList* uslist, regex_t* reg) addr = en->m.called_addr; offset = uslist->us[i].offset; - paddr = (AbsAddrType* )((void* )reg->ops + offset); + paddr = (AbsAddrType* )((char* )reg->ops + offset); *paddr = addr; } return 0; diff --git a/src/regint.h b/src/regint.h index 1ef5eb4..b8246e1 100644 --- a/src/regint.h +++ b/src/regint.h @@ -969,7 +969,7 @@ struct re_pattern_buffer { #define COP(reg) ((reg)->ops_curr) #define COP_CURR_OFFSET(reg) ((reg)->ops_used - 1) #define COP_CURR_OFFSET_BYTES(reg, p) \ - ((int )((void* )(&((reg)->ops_curr->p)) - (void* )((reg)->ops))) + ((int )((char* )(&((reg)->ops_curr->p)) - (char* )((reg)->ops))) extern void onig_add_end_call(void (*func)(void));