Commit b106620d038bc764329a29c234ffad5903479634
2019-04-16T10:56:18
examples: move MSVC compatibility macros into common header We currently have two locations in our examples where we define the same compatibility wrappers for MSVC. Move them into "common.h" to avoid duplication and make them available to other examples.
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
diff --git a/examples/blame.c b/examples/blame.c
index 0ddbfc6..fa586b3 100644
--- a/examples/blame.c
+++ b/examples/blame.c
@@ -14,11 +14,6 @@
#include "common.h"
-#ifdef _MSC_VER
-#define snprintf sprintf_s
-#define strcasecmp strcmpi
-#endif
-
/**
* This example demonstrates how to invoke the libgit2 blame API to roughly
* simulate the output of `git blame` and a few of its command line arguments.
diff --git a/examples/common.h b/examples/common.h
index ac1c067..c1d444e 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -26,6 +26,11 @@
#endif
#endif
+#ifdef _MSC_VER
+#define snprintf sprintf_s
+#define strcasecmp strcmpi
+#endif
+
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*x))
#define UNUSED(x) (void)(x)
diff --git a/examples/merge.c b/examples/merge.c
index a275ecb..8ddb79b 100644
--- a/examples/merge.c
+++ b/examples/merge.c
@@ -15,10 +15,6 @@
#include "common.h"
#include <assert.h>
-#ifdef _MSC_VER
-#define snprintf sprintf_s
-#endif
-
/** The following example demonstrates how to do merges with libgit2.
*
* It will merge whatever commit-ish you pass in into the current branch.