aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2019-11-22 22:12:03 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2019-11-22 22:44:31 -0500
commit2ae80482cd88fb9786d3ff54777b8a462641f29f (patch)
tree59ea6b7a8217c17c0c1e915616f6615cc1813d9c
parent8ff58f7703bb2854a05acfbbda317b0abad2c0e7 (diff)
downloadreloc-2ae80482cd88fb9786d3ff54777b8a462641f29f.tar.gz
Decrease MSVC chatter
-rw-r--r--CMakeLists.txt3
-rw-r--r--reloc.h2
-rw-r--r--test/test_reloc_match.c6
3 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f17030..e24cc1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,8 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU"
OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra")
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /Wall")
+ # C4996: The POSIX name for this item is deprecated
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /W4 /wd4996")
endif()
enable_testing()
diff --git a/reloc.h b/reloc.h
index f978ae5..6cc0641 100644
--- a/reloc.h
+++ b/reloc.h
@@ -15,7 +15,7 @@
#define SIZE_T_FMT "%I64u"
#elif defined(_MSC_VER)
#define DIRSEP '\\'
-#define SIZE_T_FMT "%lu"
+#define SIZE_T_FMT "%zu"
#elif defined(__linux__) || defined(__unix__) || defined(__APPLE__) || defined(__MACH__)
#define DIRSEP '/'
#define SIZE_T_FMT "%lu"
diff --git a/test/test_reloc_match.c b/test/test_reloc_match.c
index bb9d6b0..ed725cd 100644
--- a/test/test_reloc_match.c
+++ b/test/test_reloc_match.c
@@ -72,11 +72,11 @@ int test_reloc_match() {
myassert("Invalid match->end", match->end != NULL);
printf("\tpost=\"%s\", data=\"%s\"\n", match->post, match->begin);
myassert("Invalid match->post", !strcmp(match->post, test_solution_post[i]));
- printf("\tlength=%lu\n", match->length);
+ printf("\tlength=" SIZE_T_FMT "\n", match->length);
myassert("Invalid match->length", match->length == test_solution_length[i]);
- printf("\tpost_length=%lu\n", match->post_length);
+ printf("\tpost_length=" SIZE_T_FMT "\n", match->post_length);
myassert("Invalid match->post_length", match->post_length == test_solution_post_length[i]);
- printf("\ttotal_length=%lu\n", match->total_length);
+ printf("\ttotal_length=" SIZE_T_FMT "\n", match->total_length);
myassert("Invalid match->total_length", match->total_length == test_solution_total_length[i]);
if (match) {
free(match);