summaryrefslogtreecommitdiff
path: root/Build/source/texk/chktex
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
commitc08eff2883a952dd0f9325c51ad7968370452b02 (patch)
tree72080b810e039359df54696191cebf66f21d677b /Build/source/texk/chktex
parente8386671e9408e3e71d63a518a5d8851689c3e7c (diff)
MinGW64 build: Fix minor glitches, avoid compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@35527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/chktex')
-rw-r--r--Build/source/texk/chktex/ChangeLog4
-rw-r--r--Build/source/texk/chktex/regex/regcomp.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index 5b91dcb88c1..feb2a3e370a 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * regex/regcomp.c [WIN64]: Use __int64 (not long) as intptr_t.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
diff --git a/Build/source/texk/chktex/regex/regcomp.c b/Build/source/texk/chktex/regex/regcomp.c
index 7b50c10b0a6..9a6cd159baf 100644
--- a/Build/source/texk/chktex/regex/regcomp.c
+++ b/Build/source/texk/chktex/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;