From 5287894f4fb448cc301f75380e90895a59fea8a6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 4 Mar 2013 12:13:51 +0000 Subject: [PATCH] * install.cc (FileInuseDlgProc): Fix return type. * regex/regcomp.c (parse_dup_op): Fix invalid cast warning. (create_token_tree): Ditto. * setup.exe.manifest: Set processorArchitecture to "*". Add explicit requestedExecutionLevel for 64-bit compatibility. --- ChangeLog | 8 ++++++++ install.cc | 2 +- regex/regcomp.c | 4 ++-- setup.exe.manifest | 11 +++++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6169cfac..97840f7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-03-04 Yaakov Selkowitz + + * install.cc (FileInuseDlgProc): Fix return type. + * regex/regcomp.c (parse_dup_op): Fix invalid cast warning. + (create_token_tree): Ditto. + * setup.exe.manifest: Set processorArchitecture to "*". + Add explicit requestedExecutionLevel for 64-bit compatibility. + 2013-03-04 Yaakov Selkowitz * Makefile.am (inilint_extras): Remove autoload.c. diff --git a/install.cc b/install.cc index 22f929d5..7b3d4e72 100644 --- a/install.cc +++ b/install.cc @@ -197,7 +197,7 @@ typedef struct int iteration; } FileInuseDlgData; -static BOOL CALLBACK +static INT_PTR CALLBACK FileInuseDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) diff --git a/regex/regcomp.c b/regex/regcomp.c index 0dc67de2..54d8876b 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -2510,7 +2510,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, old_tree = NULL; if (elem->token.type == SUBEXP) - postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); + postorder (elem, mark_opt_subexp, (void *) (intptr_t) elem->token.opr.idx); tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); if (BE (tree == NULL, 0)) @@ -3723,7 +3723,7 @@ 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) { - int idx = (int) (long) extra; + int idx = (int) (intptr_t) extra; if (node->token.type == SUBEXP && node->token.opr.idx == idx) node->token.opt_subexp = 1; diff --git a/setup.exe.manifest b/setup.exe.manifest index df9200b4..e7b3f4b7 100755 --- a/setup.exe.manifest +++ b/setup.exe.manifest @@ -2,7 +2,7 @@ @@ -13,12 +13,19 @@ type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" - processorArchitecture="X86" + processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /> + + + + + + + -- 2.43.5