summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wojniak <kainjow@kainjow.com>2015-08-10 09:53:46 -0700
committerKevin Wojniak <kainjow@kainjow.com>2015-08-10 09:53:46 -0700
commit59bcd222c3ef1a64045e27db24ffddeb99ee29d4 (patch)
treee6693373d39137c3b2e66ea205c55670d02bf282
parent7baf9297f4f2e368c7c91ac76e16e88902987ec6 (diff)
Remove need to disable MSVC warning 4800
-rw-r--r--api_test/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt2
-rwxr-xr-xsrc/inlines.c6
-rw-r--r--src/iterator.c2
-rw-r--r--src/node.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/api_test/CMakeLists.txt b/api_test/CMakeLists.txt
index 7489388..f7dff55 100644
--- a/api_test/CMakeLists.txt
+++ b/api_test/CMakeLists.txt
@@ -18,7 +18,7 @@ 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")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4244 /wd4267 /wd4706 /D_CRT_SECURE_NO_WARNINGS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99 -pedantic")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67d7b72..ecdd016 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,7 +155,7 @@ 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")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4244 /wd4267 /wd4706 /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 -Wextra -std=c99 -pedantic")
endif()
diff --git a/src/inlines.c b/src/inlines.c
index f8a2cfc..3275ddd 100755
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -1034,13 +1034,13 @@ static int parse_inline(subject *subj, cmark_node *parent, int options) {
case '_':
case '\'':
case '"':
- new_inl = handle_delim(subj, c, options & CMARK_OPT_SMART);
+ new_inl = handle_delim(subj, c, (options & CMARK_OPT_SMART) != 0);
break;
case '-':
- new_inl = handle_hyphen(subj, options & CMARK_OPT_SMART);
+ new_inl = handle_hyphen(subj, (options & CMARK_OPT_SMART) != 0);
break;
case '.':
- new_inl = handle_period(subj, options & CMARK_OPT_SMART);
+ new_inl = handle_period(subj, (options & CMARK_OPT_SMART) != 0);
break;
case '[':
advance(subj);
diff --git a/src/iterator.c b/src/iterator.c
index 81b6f48..19dfff8 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -31,7 +31,7 @@ cmark_iter *cmark_iter_new(cmark_node *root) {
void cmark_iter_free(cmark_iter *iter) { free(iter); }
static bool S_is_leaf(cmark_node *node) {
- return (1 << node->type) & S_leaf_mask;
+ return ((1 << node->type) & S_leaf_mask) != 0;
}
cmark_event_type cmark_iter_next(cmark_iter *iter) {
diff --git a/src/node.c b/src/node.c
index ad12d63..c5f4553 100644
--- a/src/node.c
+++ b/src/node.c
@@ -426,7 +426,7 @@ int cmark_node_set_list_tight(cmark_node *node, int tight) {
}
if (node->type == CMARK_NODE_LIST) {
- node->as.list.tight = tight;
+ node->as.list.tight = tight == 1;
return 1;
} else {
return 0;