diff options
| author | Ben Straub <bs@github.com> | 2012-10-25 09:02:55 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-10-25 09:02:55 -0700 |
| commit | 1fc375e6ef0d490305ef973278aa96756835b6a5 (patch) | |
| tree | d359ab5a4da816ccba43a7e8116715045cf14725 | |
| parent | 1eb8cd7f879dbd2fc3c3c0d341f4dd6ed636b97b (diff) | |
| download | libgit2-1fc375e6ef0d490305ef973278aa96756835b6a5.tar.gz | |
Fix Windows build
Pedantic ordering of GIT_UNUSED vs. variable declarations.
| -rw-r--r-- | src/remote.c | 2 | ||||
| -rw-r--r-- | tests-clar/checkout/index.c | 2 | ||||
| -rw-r--r-- | tests-clar/checkout/tree.c | 2 | ||||
| -rw-r--r-- | tests-clar/clone/network.c | 4 | ||||
| -rw-r--r-- | tests-clar/network/fetch.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/remote.c b/src/remote.c index cc18ea072..d268fd4c3 100644 --- a/src/remote.c +++ b/src/remote.c @@ -745,7 +745,7 @@ void git_remote_set_callbacks(git_remote *remote, git_remote_callbacks *callback } } -inline const git_transfer_progress* git_remote_stats(git_remote *remote) +GIT_INLINE(const git_transfer_progress*) git_remote_stats(git_remote *remote) { assert(remote); return &remote->stats; diff --git a/tests-clar/checkout/index.c b/tests-clar/checkout/index.c index 58b3c7e37..89bc1da15 100644 --- a/tests-clar/checkout/index.c +++ b/tests-clar/checkout/index.c @@ -363,8 +363,8 @@ void test_checkout_index__wont_notify_of_expected_line_ending_changes(void) static void progress(const char *path, size_t cur, size_t tot, void *payload) { - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); bool *was_called = (bool*)payload; + GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); *was_called = true; } diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c index 598ea9fc7..c42aefc31 100644 --- a/tests-clar/checkout/tree.c +++ b/tests-clar/checkout/tree.c @@ -66,8 +66,8 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void) static void progress(const char *path, size_t cur, size_t tot, void *payload) { - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); bool *was_called = (bool*)payload; + GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); *was_called = true; } diff --git a/tests-clar/clone/network.c b/tests-clar/clone/network.c index 0faaa5c81..19385f77a 100644 --- a/tests-clar/clone/network.c +++ b/tests-clar/clone/network.c @@ -93,15 +93,15 @@ void test_clone_network__can_prevent_the_checkout_of_a_standard_repo(void) static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload) { - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); bool *was_called = (bool*)payload; + GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); (*was_called) = true; } static void fetch_progress(const git_transfer_progress *stats, void *payload) { - GIT_UNUSED(stats); bool *was_called = (bool*)payload; + GIT_UNUSED(stats); (*was_called) = true; } diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c index 74e062884..e71e02044 100644 --- a/tests-clar/network/fetch.c +++ b/tests-clar/network/fetch.c @@ -30,8 +30,8 @@ static int update_tips(const char *refname, const git_oid *a, const git_oid *b, static void progress(const git_transfer_progress *stats, void *payload) { - GIT_UNUSED(stats); bool *was_called = (bool*)payload; + GIT_UNUSED(stats); *was_called = true; } |