Merge pull request #814 from qmfrederik/msys2-minimal

Support compiling on MSYS2

Author: compnerd

CMakeLists.txt

@@ -18,14 +18,18 @@ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-  include(DispatchWindowsSupport)
-  dispatch_windows_arch_spelling(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_MSVC_ARCH)
-  dispatch_windows_include_for_arch(${DISPATCH_MSVC_ARCH} DISPATCH_INCLUDES)
-  include_directories(BEFORE SYSTEM ${DISPATCH_INCLUDES})
-  dispatch_windows_lib_for_arch(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_LIBDIR)
-  link_directories(${DISPATCH_LIBDIR})
+  if(NOT MINGW)
+    include(DispatchWindowsSupport)
+    dispatch_windows_arch_spelling(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_MSVC_ARCH)
+    dispatch_windows_include_for_arch(${DISPATCH_MSVC_ARCH} DISPATCH_INCLUDES)
+    include_directories(BEFORE SYSTEM ${DISPATCH_INCLUDES})
+    dispatch_windows_lib_for_arch(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_LIBDIR)
+    link_directories(${DISPATCH_LIBDIR})
+  endif()
 
   include(CheckCSourceCompiles)
+  include(CheckSymbolExists)
+
   check_c_source_compiles([=[
 #include <Windows.h>
 int main(int argc, char *argv[]) {
@@ -54,6 +58,42 @@ int main(int argc, char *argv[]) {
   if(DISPATCH_HAVE_EXTENDED_SLPI_22000)
     add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_22000)
   endif()
+
+  check_c_source_compiles([=[
+#include <Windows.h>
+#include <winternl.h>
+int main(int argc, char *argv[]) {
+  FILE_PIPE_LOCAL_INFORMATION fpli;
+}
+]=] HAVE_FILE_PIPE_LOCAL_INFORMATION)
+  if(HAVE_FILE_PIPE_LOCAL_INFORMATION)
+    add_compile_definitions(HAVE_FILE_PIPE_LOCAL_INFORMATION)
+  endif()
+
+  check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+  if(HAVE_MKSTEMP)
+    add_compile_definitions(HAVE_MKSTEMP)
+  endif()
+
+  check_c_source_compiles([=[
+#include <sys/types.h>
+int main(int argc, char *argv[]) {
+  mode_t mode;
+}
+]=] HAVE_MODE_T)
+  if(HAVE_MODE_T)
+    add_compile_definitions(HAVE_MODE_T)
+  endif()
+
+  check_c_source_compiles([=[
+#include <sys/types.h>
+int main(int argc, char *argv[]) {
+  pid_t mode;
+}
+]=] HAVE_PID_T)
+  if(HAVE_PID_T)
+    add_compile_definitions(HAVE_PID_T)
+  endif()
 endif()
 
 set(CMAKE_C_STANDARD 11)

cmake/modules/DispatchCompilerWarnings.cmake

@@ -1,6 +1,10 @@
 
 if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
   # TODO: someone needs to provide the msvc equivalent warning flags
+elseif(WIN32)
+  # Tareting Windows but using a non-MSVC compiler.  Set -fms-extensions
+  # so that we can use __popcnt64
+  add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fms-extensions>)
 else()
   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)

os/generic_win_base.h

@@ -24,7 +24,9 @@
 // Unices provide `howmany` via sys/param.h
 #define howmany(x, y)  (((x) + ((y) - 1)) / (y))
 
+#ifndef HAVE_MODE_T
 typedef int mode_t;
+#endif
 typedef void pthread_attr_t;
 
 #ifndef API_AVAILABLE

src/event/workqueue.c

@@ -24,6 +24,11 @@
 
 #if defined(_WIN32)
 #include <wct.h>
+
+#if !defined(WCT_MAX_NODE_COUNT)
+#define WCT_MAX_NODE_COUNT 16
+#endif
+
 #endif
 
 /*

src/shims/generic_win_stubs.h

@@ -49,6 +49,7 @@ bool _dispatch_handle_is_socket(HANDLE hFile);
 void _dispatch_QueryInterruptTimePrecise(PULONGLONG lpInterruptTimePrecise);
 void _dispatch_QueryUnbiasedInterruptTimePrecise(PULONGLONG lpUnbiasedInterruptTimePrecise);
 
+#ifndef HAVE_FILE_PIPE_LOCAL_INFORMATION
 enum {
 	FilePipeLocalInformation = 24,
 };
@@ -65,6 +66,7 @@ typedef struct _FILE_PIPE_LOCAL_INFORMATION {
 	ULONG NamedPipeState;
 	ULONG NamedPipeEnd;
 } FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION;
+#endif
 
 NTSTATUS _dispatch_NtQueryInformationFile(HANDLE FileHandle,
 		PIO_STATUS_BLOCK IoStatusBlock, PVOID FileInformation, ULONG Length,

tests/generic_win_port.c

@@ -238,6 +238,7 @@ randomize_name(char *out)
 	}
 }
 
+#ifndef HAVE_MKSTEMP
 dispatch_fd_t
 mkstemp(char *tmpl)
 {
@@ -257,6 +258,7 @@ mkstemp(char *tmpl)
 	errno = EEXIST;
 	return -1;
 }
+#endif
 
 void
 print_winapi_error(const char *function_name, DWORD error)

tests/generic_win_port.h

@@ -7,7 +7,9 @@
 #include <Windows.h>
 
 typedef int kern_return_t;
+#ifndef HAVE_PID_T
 typedef int pid_t;
+#endif
 
 #if defined(_WIN64)
 typedef long long ssize_t;
@@ -68,8 +70,10 @@ mach_timebase_info(mach_timebase_info_t tbi)
 	return 0;
 }
 
+#ifndef HAVE_MKSTEMP
 dispatch_fd_t
 mkstemp(char *tmpl);
+#endif
 
 void
 print_winapi_error(const char *function_name, DWORD error);