Merge pull request #1176 from slyshykO/fix-msvc-build

Fixed compilation for MSVC
stlink-org · Aug 13, 2021 · a6d19d7 · a6d19d7
2 parents 165776a + e5152c4
commit a6d19d7
Show file tree

Hide file tree

Showing 3 changed files with 293 additions and 259 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,6 +75,11 @@ if (STLINK_HAVE_UNISTD_H)
     add_definitions(-DSTLINK_HAVE_UNISTD_H)
 endif ()
 
+CHECK_INCLUDE_FILE(dirent.h STLINK_HAVE_DIRENT_H)
+if (STLINK_HAVE_DIRENT_H)
+    add_definitions(-DSTLINK_HAVE_DIRENT_H)
+endif ()
+
 if (MSVC)
     # Use string.h rather than strings.h and disable annoying warnings
     add_definitions(-DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS /wd4710)

diff --git a/src/common.c b/src/common.c
@@ -1541,7 +1541,7 @@ int stlink_chip_id(stlink_t *sl, uint32_t *chip_id) {
 
   if (ret || !(*chip_id)) {
     *chip_id = 0;
-    ret = ret?:-1;
+    ret = ret?ret:-1;
     ELOG("Could not find chip id!\n");
   } else {
     *chip_id = (*chip_id) & 0xfff;