From 73dcf2876fecab9adba9ec9bc148ccbab431af12 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 12 Jan 2010 16:39:25 +0000 Subject: [PATCH] msvc: Fix some "unreferenced formal parameter" warnings Signed-off-by: Ramsay Jones --- src/cc-compat.h | 6 ++++++ src/fileops.h | 3 +++ tests/t0020-dirent.c | 2 ++ 3 files changed, 11 insertions(+) diff --git a/src/cc-compat.h b/src/cc-compat.h index aefe66d19..5071d5322 100644 --- a/src/cc-compat.h +++ b/src/cc-compat.h @@ -40,6 +40,12 @@ # endif #endif +#if defined(_MSC_VER) +#define GIT_UNUSED_ARG(x) ((void)(x)); /* note trailing ; */ +#else +#define GIT_UNUSED_ARG(x) +#endif + /* * Does our compiler/platform support the C99 and * header files. (C99 requires that diff --git a/src/fileops.h b/src/fileops.h index c5c58a0da..53495ca95 100644 --- a/src/fileops.h +++ b/src/fileops.h @@ -15,12 +15,15 @@ #ifdef GIT_WIN32 GIT_INLINE(int) link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new)) { + GIT_UNUSED_ARG(old) + GIT_UNUSED_ARG(new) errno = ENOSYS; return -1; } GIT_INLINE(int) git__mkdir(const char *path, int GIT_UNUSED(mode)) { + GIT_UNUSED_ARG(mode) return mkdir(path); } diff --git a/tests/t0020-dirent.c b/tests/t0020-dirent.c index 334fff149..399b7d5ee 100644 --- a/tests/t0020-dirent.c +++ b/tests/t0020-dirent.c @@ -186,6 +186,8 @@ static walk_data empty = { static int dont_call_me(void *GIT_UNUSED(state), char *GIT_UNUSED(path)) { + GIT_UNUSED_ARG(state) + GIT_UNUSED_ARG(path) test_die("dont_call_me: unexpected callback!"); }