From f51763461658da7c03fb465bf91d7c941f2223f4 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 26 Aug 2010 14:34:07 +0200 Subject: [PATCH] Fix compile error on MinGW The only difference between the declarations and function definitions here is the use of 'internal_function'. If _LIBC is not defined and __i386__ is, then this actually means something. Signed-off-by: Johannes Schindelin --- compat/regex/regexec.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c index 0194965c5d..44f6fac724 100644 --- a/compat/regex/regexec.c +++ b/compat/regex/regexec.c @@ -40,19 +40,24 @@ static reg_errcode_t re_search_internal (const regex_t *preg, const char *string, int length, int start, int range, int stop, size_t nmatch, regmatch_t pmatch[], - int eflags); + int eflags) + internal_function; static int re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, int length1, const char *string2, int length2, int start, int range, struct re_registers *regs, - int stop, int ret_len); + int stop, int ret_len) + internal_function; static int re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, int start, int range, int stop, struct re_registers *regs, - int ret_len); + int ret_len) + internal_function; static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, - int nregs, int regs_allocated); -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); + int nregs, int regs_allocated) + internal_function; +static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) + internal_function; static int check_matching (re_match_context_t *mctx, int fl_longest_match, int *p_match_first) internal_function; static int check_halt_state_context (const re_match_context_t *mctx, @@ -353,6 +358,7 @@ weak_alias (__re_search_2, re_search_2) #endif static int +internal_function re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, int length1, const char *string2, int length2, int start, @@ -397,6 +403,7 @@ re_search_2_stub (struct re_pattern_buffer *bufp, otherwise the position of the match is returned. */ static int +internal_function re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, int start, int range, int stop, @@ -484,6 +491,7 @@ re_search_stub (struct re_pattern_buffer *bufp, } static unsigned +internal_function re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) @@ -614,6 +622,7 @@ re_exec (s) (START + RANGE >= 0 && START + RANGE <= LENGTH) */ static reg_errcode_t +internal_function re_search_internal (const regex_t *preg, const char *string, int length, int start, int range, int stop, @@ -938,6 +947,7 @@ re_search_internal (const regex_t *preg, } static reg_errcode_t +internal_function prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; -- 2.11.4.GIT