From d756a2f8585a2059889766a1e555b8418755949a Mon Sep 17 00:00:00 2001
From: Snaipe <franklinmathieu@gmail.com>
Date: Sat, 5 Sep 2015 15:28:44 +0200
Subject: [PATCH] Started to take another try for MSVC compatibility

---
 include/criterion/common.h    | 44 +++++++++++++++++++++++++++++++++--
 include/criterion/criterion.h |  8 +++----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/include/criterion/common.h b/include/criterion/common.h
index 3a8d3a8..2a1a630 100644
--- a/include/criterion/common.h
+++ b/include/criterion/common.h
@@ -24,18 +24,50 @@
 #ifndef CRITERION_COMMON_H_
 # define CRITERION_COMMON_H_
 
+# define CR_EXPAND(x) x
+
+# if defined(_MSC_VER)
+#  if _MSC_VER < 1900
+#   error \
+        Your version of MSVC++ is too old, please compile your tests using  \
+        a c99 compiler, like MinGW or MSVC 14.0+ (Included in visual studio \
+        2015)
+#  endif
+# endif
+
+# ifndef CR_IS_MSVC
+#  ifdef _MSC_VER
+#   define CR_IS_MSVC _MSC_VER
+#  else
+#   define CR_IS_MSVC 0
+#  endif
+# endif
+
 # ifdef __APPLE__
 #  define SECTION_START_PREFIX       __first
 #  define SECTION_END_PREFIX         __last
 #  define SECTION_START_SUFFIX(Name) __asm("section$start$__DATA$" Name)
 #  define SECTION_END_SUFFIX(Name)   __asm("section$end$__DATA$" Name)
 #  define SECTION_(Name)             __attribute__((section("__DATA," Name)))
+#  define SECTION_SUFFIX_
+# elif CR_IS_MSVC
+#  define SECTION_START_PREFIX       __start
+#  define SECTION_END_PREFIX         __stop
+#  define SECTION_START_SUFFIX(Name)
+#  define SECTION_END_SUFFIX(Name)
+#  define SECTION_(Name)                    \
+    __pragma(data_seg(push))                \
+    __pragma(section(Name, read))           \
+    __declspec(allocate(Name))
+#  define SECTION_SUFFIX_                   \
+    __pragma(data_seg(pop))
 # else
 #  define SECTION_START_PREFIX       __start
 #  define SECTION_END_PREFIX         __stop
 #  define SECTION_START_SUFFIX(Name)
 #  define SECTION_END_SUFFIX(Name)
 #  define SECTION_(Name)             __attribute__((section(Name)))
+#  define SECTION_SUFFIX_
 # endif
 
 # define MAKE_IDENTIFIER_(Prefix, Id) MAKE_IDENTIFIER__(Prefix, Id)
@@ -56,8 +88,16 @@
     Type *const SECTION_START(Name) = &SECTION_START_(Name);    \
     Type *const SECTION_END(Name)   = &SECTION_END_(Name)
 
-# define UNUSED __attribute__((unused))
-# define NORETURN __attribute__((noreturn))
+# ifdef __GNUC__
+#  define UNUSED __attribute__((unused))
+#  define NORETURN __attribute__((noreturn))
+# elif CR_IS_MSVC
+#  define UNUSED
+#  define NORETURN __declspec(noreturn)
+# else
+#  define UNUSED
+#  define NORETURN
+# endif
 
 # ifdef _WIN32
 #  define SIZE_T_FORMAT "%Iu"
diff --git a/include/criterion/criterion.h b/include/criterion/criterion.h
index c26ad26..e68f841 100644
--- a/include/criterion/criterion.h
+++ b/include/criterion/criterion.h
@@ -36,7 +36,7 @@
 # define SUITE_IDENTIFIER_(Name, Suffix) \
     suite_ ## Name ## _ ## Suffix
 
-# define Test(...) Test_(__VA_ARGS__, .sentinel_ = 0)
+# define Test(...) CR_EXPAND(Test_(__VA_ARGS__, .sentinel_ = 0))
 # define Test_(Category, Name, ...)                                            \
     TEST_PROTOTYPE_(Category, Name);                                           \
     struct criterion_test_extra_data IDENTIFIER_(Category, Name, extra) = {    \
@@ -51,10 +51,10 @@
         .category = #Category,                                                 \
         .test     = IDENTIFIER_(Category, Name, impl),                         \
         .data     = &IDENTIFIER_(Category, Name, extra)                        \
-    };                                                                         \
+    } SECTION_SUFFIX_;                                                         \
     TEST_PROTOTYPE_(Category, Name)
 
-# define TestSuite(...) TestSuite_(__VA_ARGS__, .sentinel_ = 0)
+# define TestSuite(...) CR_EXPAND(TestSuite_(__VA_ARGS__, .sentinel_ = 0))
 # define TestSuite_(Name, ...)                                                 \
     struct criterion_test_extra_data SUITE_IDENTIFIER_(Name, extra) = {        \
         .file_    = __FILE__,                                                  \
@@ -65,7 +65,7 @@
     const struct criterion_suite SUITE_IDENTIFIER_(Name, meta) = {             \
         .name     = #Name,                                                     \
         .data     = &SUITE_IDENTIFIER_(Name, extra),                           \
-    }
+    } SECTION_SUFFIX_
 
 int criterion_run_all_tests(void);