Fix get_operating_system_name

gammasoft71 · Dec 11, 2023 · 1099f63 · 1099f63
1 parent fa1d96e
commit 1099f63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/cmake/xtd_commands.cmake b/scripts/cmake/xtd_commands.cmake
@@ -60,12 +60,12 @@ endmacro ()
 ##  message("The current operating system name is \"${OPERATING_SYSTEM_NAME}\"")
 ## @endcode
 macro(get_operating_system_name OPERATING_SYSTEM_NAME)
-  if (WIN32)
+  if (MSYS) # MSYS2, MINGW32 and MINGW64
+    set(${OPERATING_SYSTEM_NAME} "MSYS")
+  elseif (WIN32)
     set(${OPERATING_SYSTEM_NAME} "Windows")
   elseif (APPLE)
     set(${OPERATING_SYSTEM_NAME} "macOS")
-  elseif (MSYS) # MSYS2, MINGW32 and MINGW64
-    set(${OPERATING_SYSTEM_NAME} "MSYS")
   elseif (UNIX)
     exec_program("uname" OUTPUT_VARIABLE ${OPERATING_SYSTEM_NAME})
   else ()

diff --git a/src/xtd.core.native.macos/include/xtd/native/macos/mutex.h b/src/xtd.core.native.macos/include/xtd/native/macos/mutex.h
@@ -22,6 +22,7 @@ static inline int pthread_mutex_timedlock(pthread_mutex_t* mut, const struct tim
       }
       usleep(20000);
     } else return -1;
+    usleep(20000);
   }
   return 0;
 }