From f222b8e2ef1ffcd18c6093cd1272fd9e8b757291 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 24 Nov 2014 21:09:09 +0100
Subject: Cast void* for MSVC compatibility

---
 src/blocks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/blocks.c b/src/blocks.c
index 5328638..6f995b3 100644
--- a/src/blocks.c
+++ b/src/blocks.c
@@ -439,7 +439,8 @@ extern cmark_node *cmark_parse_document(const char *buffer, size_t len)
 	cmark_node *document;
 
 	while (buffer < end) {
-		const char *eol = memchr(buffer, '\n', end - buffer);
+		const char *eol
+			= (const char *)memchr(buffer, '\n', end - buffer);
 		offset = eol ? (eol - buffer) + 1 : end - buffer;
 		cmark_process_line(parser, buffer, offset);
 		buffer += offset;
-- 
cgit v1.2.3


From 7e1d399584fd2eb0c8e6f49c473ff6b1a2a7ecf6 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 24 Nov 2014 21:59:30 +0100
Subject: Fix MSVC options

Also disable some warnings.
---
 src/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71f45a7..f71f09c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,13 +121,14 @@ if(MSVC)
   else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
   endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4244 /wd4267 /wd4706 /wd4800 /D_CRT_SECURE_NO_WARNINGS")
 elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99 -pedantic")
 endif()
 
 # Compile as C++ under MSVC
 if(MSVC)
-  set(CMAKE_C_FLAGS "/TP")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
 endif()
 
 if($ENV{TIMER})
-- 
cgit v1.2.3