Fix windows build

- Fix c11 check for windows - add prototypes for STATIC_KQUEUE case - comment out missing include file - extend check for architecture in win_pthread
digiverse · Apr 7, 2014 · aabd4ab · aabd4ab
1 parent 0609c0e
commit aabd4ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/libdispatch/src/shared_constructor.c b/libdispatch/src/shared_constructor.c
@@ -27,6 +27,10 @@ void __attribute((destructor)) cleanup(void);
 
 #else
 
+# if STATIC_KQUEUE
+void libkqueue_thread_attach();
+void libkqueue_thread_detach();
+# endif
 int init();
 void cleanup();
 

diff --git a/libkqueue/include/sys/event.h b/libkqueue/include/sys/event.h
@@ -190,8 +190,8 @@ kevent(int kq, const struct kevent *changelist, int nchanges,
 	    const struct timespec *timeout);
 
 #ifdef MAKE_STATIC
-__declspec(dllexport) int
-libkqueue_init();
+__declspec(dllexport) void
+libkqueue_init(void);
 #endif
 
 #else
@@ -200,7 +200,7 @@ int     kevent(int kq, const struct kevent *changelist, int nchanges,
 	    struct kevent *eventlist, int nevents,
 	    const struct timespec *timeout);
 #ifdef MAKE_STATIC
-void     libkqueue_init();
+void     libkqueue_init(void);
 #endif
 #endif
 

diff --git a/libkqueue/src/common/private.h b/libkqueue/src/common/private.h
@@ -35,7 +35,7 @@ struct evfilt_data;
 
 #if defined(_WIN32)
 # include "../windows/platform.h"
-# include "../common/queue.h"
+//# include "../common/queue.h"
 # if !defined(NDEBUG) && !defined(__GNUC__)
 #  include <crtdbg.h>
 # endif

diff --git a/libpthread_workqueue/src/private.h b/libpthread_workqueue/src/private.h
@@ -88,7 +88,7 @@ extern unsigned int PWQ_ACTIVE_CPU;
  rep/nop / 0xf3+0x90 are the same as the symbolic 'pause' instruction
  */
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__i386) || defined(__amd64)
+#if defined(__i386__) || defined(__x86_64__) || defined(__i386) || defined(__amd64) || defined(_M_IX86)
 
 #if defined(__SUNPRO_CC)
 

diff --git a/libxdispatch/include/xdispatch/platform.h b/libxdispatch/include/xdispatch/platform.h
@@ -96,7 +96,7 @@
   #  define XDISPATCH_CPP11_TYPE_TRAITS 1
   #  define XDISPATCH_CPP11_MEMORY 1
   #  define XDISPATCH_CPP11_FUNCTIONAL 1
- # elif __GLIBCXX__ < 20120322 || ( !XDISPATCH_CPP11 )
+ # elif __GLIBCXX__ < 20120322 && ( !XDISPATCH_CPP11 )
   #  define XDISPATCH_TR1_FUNCTIONAL 1
   #  include <tr1/functional>
  # endif // if __GLIBCXX__ < 20120322