From 5493d123ae738c5f035aab3a10ee017d18d9c5ce Mon Sep 17 00:00:00 2001 From: Nate Parsons Date: Fri, 10 Sep 2010 10:00:25 +0200 Subject: [PATCH] Fix compile for MinGW (continued) This fixes the fix in efe33c61(Fix compile error on MinGW). It only fixed things on one computer, but apparently not on others. The only difference between the declarations and function definitions here is the 'internal_function's. if _LIBC is not defined and __i386__ is, then this actually means something. [jes cobbled together the commit message and the commit from all over the place and cannot be held responsible for misrepresentations.] Signed-off-by: Johannes Schindelin --- compat/regex/regexec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c index aaf9c10cc3..f699b9375e 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,