thodg/libgit2

diff --git a/src/path.c b/src/path.c
index d29b992..114d7b7 100644
--- a/src/path.c
+++ b/src/path.c
@@ -965,7 +965,7 @@ int git_path_direach(
 	path_dirent_data de_data;
 	struct dirent *de, *de_buf = (struct dirent *)&de_data;
 
-	(void)flags;
+	GIT_UNUSED(flags);
 
 #ifdef GIT_USE_ICONV
 	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
@@ -1036,7 +1036,7 @@ int git_path_dirload(
 	path_dirent_data de_data;
 	struct dirent *de, *de_buf = (struct dirent *)&de_data;
 
-	(void)flags;
+	GIT_UNUSED(flags);
 
 #ifdef GIT_USE_ICONV
 	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c
index b8ae805..721c390 100644
--- a/tests/checkout/conflict.c
+++ b/tests/checkout/conflict.c
@@ -1078,8 +1078,8 @@ static void collect_progress(
 {
 	git_vector *paths = payload;
 
-	(void)completed_steps;
-	(void)total_steps;
+	GIT_UNUSED(completed_steps);
+	GIT_UNUSED(total_steps);
 
 	if (path == NULL)
 		return;