Commit 1fc375e6ef0d490305ef973278aa96756835b6a5
2012-10-25T09:02:55
Fix Windows build Pedantic ordering of GIT_UNUSED vs. variable declarations.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/src/remote.c b/src/remote.c
index cc18ea0..d268fd4 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 58b3c7e..89bc1da 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 598ea9f..c42aefc 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 0faaa5c..19385f7 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 74e0628..e71e020 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;
}