summaryrefslogtreecommitdiff
path: root/test-parse-options.c
diff options
context:
space:
mode:
authorMarat Radchenko <marat@slonopotamus.org>2014-03-30 11:08:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 18:54:27 (GMT)
commite25c070cb5c85ac3abe787373563a31c8893a669 (patch)
treee1c5876d9f603d5b0b063fc4a61125297f2994e3 /test-parse-options.c
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff)
downloadgit-e25c070cb5c85ac3abe787373563a31c8893a669.zip
git-e25c070cb5c85ac3abe787373563a31c8893a669.tar.gz
git-e25c070cb5c85ac3abe787373563a31c8893a669.tar.bz2
MSVC: fix t0040-parse-options crash
On 64-bit MSVC, pointers are 64 bit but `long` is only 32. Thus, casting string to `unsigned long`, which is redundand on other platforms, throws away important bits and when later cast to `intptr_t` results in corrupt pointer. This patch fixes test-parse-options by replacing harming cast with correct one. Signed-off-by: Marat Radchenko <marat@slonopotamus.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-parse-options.c')
-rw-r--r--test-parse-options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-parse-options.c b/test-parse-options.c
index 434e8b8..6f6c656 100644
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
OPT_STRING('o', NULL, &string, "str", "get another string"),
OPT_NOOP_NOARG(0, "obsolete"),
OPT_SET_PTR(0, "default-string", &string,
- "set string to default", (unsigned long)"default"),
+ "set string to default", (intptr_t)"default"),
OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
OPT_GROUP("Magic arguments"),
OPT_ARGUMENT("quux", "means --quux"),