This commit touches regcomp.c and poll.c from Gnulib, both were fixed upstream in 2012 the same way. Wrt ShellExecute, see [1]. [1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx Signed-off-by: Marat Radchenko <marat@xxxxxxxxxxxxxxxx> --- compat/mingw.c | 8 ++++---- compat/poll/poll.c | 2 +- compat/regex/regcomp.c | 4 ++-- compat/win32/pthread.h | 2 +- compat/winansi.c | 2 +- pack-revindex.c | 2 +- sha1_file.c | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index c5c37e5..27925d9 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -674,13 +674,13 @@ int pipe(int filedes[2]) errno = err_win_to_posix(GetLastError()); return -1; } - filedes[0] = _open_osfhandle((int)h[0], O_NOINHERIT); + filedes[0] = _open_osfhandle((intptr_t)h[0], O_NOINHERIT); if (filedes[0] < 0) { CloseHandle(h[0]); CloseHandle(h[1]); return -1; } - filedes[1] = _open_osfhandle((int)h[1], O_NOINHERIT); + filedes[1] = _open_osfhandle((intptr_t)h[1], O_NOINHERIT); if (filedes[0] < 0) { close(filedes[0]); CloseHandle(h[1]); @@ -1819,7 +1819,7 @@ void mingw_open_html(const char *unixpath) const char *, const char *, const char *, INT); T ShellExecute; HMODULE shell32; - int r; + intptr_t r; shell32 = LoadLibrary("shell32.dll"); if (!shell32) @@ -1829,7 +1829,7 @@ void mingw_open_html(const char *unixpath) die("cannot run browser"); printf("Launching default browser to display HTML ...\n"); - r = (int)ShellExecute(NULL, "open", htmlpath, NULL, "\\", SW_SHOWNORMAL); + r = (intptr_t)ShellExecute(NULL, "open", htmlpath, NULL, "\\", SW_SHOWNORMAL); FreeLibrary(shell32); /* see the MSDN documentation referring to the result codes here */ if (r <= 32) { diff --git a/compat/poll/poll.c b/compat/poll/poll.c index a9b41d8..8941249 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -76,7 +76,7 @@ #ifdef WIN32_NATIVE -#define IsConsoleHandle(h) (((long) (h) & 3) == 3) +#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) static BOOL IsSocketHandle (HANDLE h) diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index 06f3088..d8bde06 100644 --- a/compat/regex/regcomp.c +++ b/compat/regex/regcomp.c @@ -2577,7 +2577,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)) @@ -3806,7 +3806,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/compat/win32/pthread.h b/compat/win32/pthread.h index 8ad1873..6ccfb7b 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -77,7 +77,7 @@ extern pthread_t pthread_self(void); static inline int pthread_exit(void *ret) { - ExitThread((DWORD)ret); + ExitThread((DWORD)(uintptr_t)ret); } typedef DWORD pthread_key_t; diff --git a/compat/winansi.c b/compat/winansi.c index 0ac3297..ca4c295 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -452,7 +452,7 @@ static HANDLE duplicate_handle(HANDLE hnd) HANDLE hresult, hproc = GetCurrentProcess(); if (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE, DUPLICATE_SAME_ACCESS)) - die_lasterr("DuplicateHandle(%li) failed", (long) hnd); + die_lasterr("DuplicateHandle(%p) failed", hnd); return hresult; } diff --git a/pack-revindex.c b/pack-revindex.c index 5c8376e..df02e9f 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -21,7 +21,7 @@ static int pack_revindex_hashsz; static int pack_revindex_ix(struct packed_git *p) { - unsigned long ui = (unsigned long)p; + uintptr_t ui = (uintptr_t)p; int i; ui = ui ^ (ui >> 16); /* defeat structure alignment */ diff --git a/sha1_file.c b/sha1_file.c index c08c0cb..a534fda 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1966,11 +1966,11 @@ static struct delta_base_cache_entry { enum object_type type; } delta_base_cache[MAX_DELTA_CACHE]; -static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset) +static uintptr_t pack_entry_hash(struct packed_git *p, off_t base_offset) { - unsigned long hash; + uintptr_t hash; - hash = (unsigned long)p + (unsigned long)base_offset; + hash = (uintptr_t)p + base_offset; hash += (hash >> 8) + (hash >> 16); return hash % MAX_DELTA_CACHE; } @@ -1978,7 +1978,7 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset) static struct delta_base_cache_entry * get_delta_base_cache_entry(struct packed_git *p, off_t base_offset) { - unsigned long hash = pack_entry_hash(p, base_offset); + uintptr_t hash = pack_entry_hash(p, base_offset); return delta_base_cache + hash; } -- 2.1.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html