diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-11-24 21:34:19 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-11-24 21:34:19 -0800 |
| commit | be834300a31ffac837b6434650c206aa8e292e1b (patch) | |
| tree | c6353469918635bd2a08b1c8b83074f8e3a67b00 /src | |
| parent | 6bd809b6b4836e1026998c2d4c1fc76506de3e8f (diff) | |
| parent | 9de6890f11cf6d1947132bbf90e3735aabb0a683 (diff) | |
Merge pull request #218 from nwellnhof/windows_fixes
Windows fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/blocks.c | 3 |
2 files changed, 4 insertions, 2 deletions
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}) 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; |