fixed code for windows

Author: mulle-nat

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.14)
+cmake_minimum_required( VERSION 3.13...99.99)
 
 project( mulle-thread VERSION 4.6.2 LANGUAGES C)
 

src/mulle-thread-c11.h

@@ -41,6 +41,9 @@
 #include <errno.h>
 #include <threads.h>
 
+typedef int   mulle_thread_rval_t;
+#define mulle_thread_return()  return( 0) // bogus, exit is returned differently
+
 
 //typedef once_flag   mulle_thread_once_t;
 typedef mtx_t       mulle_thread_mutex_t;
@@ -95,7 +98,7 @@ static inline int   mulle_thread_detach( mulle_thread_t thread)
 }
 
 
-static inline void   mulle_thread_exit( mulle_thread_rval_t rval)
+static inline void   mulle_thread_exit( int rval)
 {
    thrd_exit( rval);
 }

src/mulle-thread-pthreads.h

@@ -42,6 +42,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef void   *mulle_thread_rval_t;
+#define mulle_thread_return()  return( NULL)
+
 
 //typedef pthread_once_t    mulle_thread_once_t;
 typedef pthread_mutex_t   mulle_thread_mutex_t;
@@ -71,7 +74,7 @@ static inline int   mulle_thread_create( mulle_thread_function_t *f,
                                          void *arg,
                                          mulle_thread_t *p_thread)
 {
-   return( pthread_create( p_thread, NULL, (void *(*)()) f, arg));
+   return( pthread_create( p_thread, NULL, f, arg));
 }
 
 
@@ -99,7 +102,7 @@ static inline int   mulle_thread_detach( mulle_thread_t thread)
 }
 
 
-static inline void   mulle_thread_exit( mulle_thread_rval_t rval)
+static inline void   mulle_thread_exit( int rval)
 {
    pthread_exit( (void *) (intptr_t) rval);
 }

src/mulle-thread-windows.c

@@ -177,7 +177,7 @@ static struct
 } global;
 
 
-static void   mulle_thread_tss_init( void)
+void   mulle_thread_tss_init( void)
 {
    for(;;)
    {
@@ -195,7 +195,7 @@ static void   mulle_thread_tss_init( void)
 }
 
 
-static void   mulle_thread_tss_done( void)
+void   mulle_thread_tss_done( void)
 {
    for(;;)
    {

src/mulle-thread-windows.h

@@ -43,7 +43,8 @@
 #include <errno.h>
 #include <assert.h>
 
-
+typedef unsigned int   mulle_thread_rval_t;
+#define mulle_thread_return()  return( 0)
 
 typedef DWORD    mulle_thread_tss_t;
 typedef HANDLE   mulle_thread_t;
@@ -80,7 +81,7 @@ static inline int   mulle_thread_create( mulle_thread_function_t *f,
 }
 
 
-static inline void   mulle_thread_exit( mulle_thread_rval_t rval)
+static inline void   mulle_thread_exit( int rval)
 {
    extern void  mulle_thread_windows_destroy_tss( void);
 

src/mulle-thread.h

@@ -55,24 +55,24 @@
 #endif
 
 
-// clang lies about __STDC_NO_THREADS__
+// clang lies about __STDC_NO_THREADS__, gcc does not necessary
+// windows thinks it has threads.h but its apparently something else ?
 
-#ifndef HAVE_C11_THREADS
-# ifdef __clang__
-#  if __has_include(<threads.h>)
-#    define HAVE_C11_THREADS 1
-#  endif
-# else
-#  if __STDC_VERSION__ >= 201112L && ! defined( __STDC_NO_THREADS__)
-#   define HAVE_C11_THREADS  1
+#ifndef _WIN32
+# ifndef HAVE_C11_THREADS
+#  if defined( __has_include) || defined( __clang__) || (defined(__GNUC__) && (__GNUC__ >= 5))
+#   if __has_include(<threads.h>)
+#     define HAVE_C11_THREADS 1
+#   endif
+#  else
+#   if __STDC_VERSION__ >= 201112L && ! defined( __STDC_NO_THREADS__)
+#    define HAVE_C11_THREADS  1
+#   endif
 #  endif
 # endif
 #endif
 
 
-typedef int   mulle_thread_rval_t;
-#define mulle_thread_return()  return( 0) // bogus, exit is returned differently
-
 #if HAVE_C11_THREADS && ! defined( MULLE_THREAD_USE_PTHREADS)
 # if TRACE_INCLUDE
 #  pragma message( "Using C11 for threads")