summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJacques Germishuys <jacquesg@striata.com>2014-07-05 21:25:55 +0200
committerJacques Germishuys <jacquesg@striata.com>2014-07-06 09:22:24 +0200
commitcde32d4d28ae14e583853d07cdaf19ef9ee2dd25 (patch)
tree33f914eb1d031060df98ba7f77001d8dc83272e8 /src
parentab864e9c7156e76863a2375d8117a049cb90bf1b (diff)
downloadlibgit2-cde32d4d28ae14e583853d07cdaf19ef9ee2dd25.tar.gz
Variadic macros is only available from Visual Studio 2005+
Diffstat (limited to 'src')
-rw-r--r--src/trace.h10
-rw-r--r--src/win32/msvc-compat.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/trace.h b/src/trace.h
index 4d4e3bf53..486084d01 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -46,8 +46,16 @@ GIT_INLINE(void) git_trace__write_fmt(
#else
+GIT_INLINE(void) git_trace__null(
+ git_trace_level_t level,
+ const char *fmt, ...)
+{
+ GIT_UNUSED(level);
+ GIT_UNUSED(fmt);
+}
+
#define git_trace_level() ((void)0)
-#define git_trace(lvl, ...) ((void)0)
+#define git_trace git_trace__null
#endif
diff --git a/src/win32/msvc-compat.h b/src/win32/msvc-compat.h
index f79acaacc..fa4e2912c 100644
--- a/src/win32/msvc-compat.h
+++ b/src/win32/msvc-compat.h
@@ -38,7 +38,7 @@
typedef SSIZE_T ssize_t;
/* define snprintf using variadic macro support if available */
-#if _MSC_VER >= 1400
+#if _MSC_VER >= 1500
# define snprintf(BUF, SZ, FMT, ...) _snprintf_s(BUF, SZ, _TRUNCATE, FMT, __VA_ARGS__)
#else
# define snprintf _snprintf