From c08eff2883a952dd0f9325c51ad7968370452b02 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 6 Nov 2014 13:40:17 +0000 Subject: MinGW64 build: Fix minor glitches, avoid compiler warnings git-svn-id: svn://tug.org/texlive/trunk@35527 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/pdftexdir/regex/regcomp.c | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'Build/source/texk/web2c/pdftexdir') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 6f048becfbe..c7bebe0b6f5 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-11-06 Peter Breitenlohner + + * regex/regcomp.c [WIN64]: Use __int64 (not long) as intptr_t. + 2014-08-19 Peter Breitenlohner * writepng.c: Avoid PNG warnings. diff --git a/Build/source/texk/web2c/pdftexdir/regex/regcomp.c b/Build/source/texk/web2c/pdftexdir/regex/regcomp.c index 7b50c10b0a6..9a6cd159baf 100644 --- a/Build/source/texk/web2c/pdftexdir/regex/regcomp.c +++ b/Build/source/texk/web2c/pdftexdir/regex/regcomp.c @@ -2499,7 +2499,11 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, old_tree = NULL; if (elem->token.type == SUBEXP) +#ifdef _WIN64 + postorder (elem, mark_opt_subexp, (void *) (__int64) elem->token.opr.idx); +#else postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); +#endif tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); if (BE (tree == NULL, 0)) @@ -3711,7 +3715,11 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node) { +#ifdef _WIN64 + int idx = (int) (__int64) extra; +#else int idx = (int) (long) extra; +#endif if (node->token.type == SUBEXP && node->token.opr.idx == idx) node->token.opt_subexp = 1; -- cgit v1.2.3