Merge branch 'staging' of https://github.com/stahta01/wxWidgets_PR

Fix Cygwin 64 bit build issues for wxGTK.

See https://github.com/wxWidgets/wxWidgets/pull/1460

include/wx/msw/chkconf.h

@@ -444,6 +444,14 @@
 #           define wxUSE_FSWATCHER 0
 #       endif
 #   endif
+#   if wxUSE_JOYSTICK
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxJoystick requires wxThread under MSW"
+#       else
+#           undef wxUSE_JOYSTICK
+#           define wxUSE_JOYSTICK 0
+#       endif
+#   endif
 #endif /* !wxUSE_THREADS */
 
 

include/wx/platform.h

@@ -280,6 +280,11 @@
 #    if defined(__INNOTEK_LIBC__)
         /* Ensure visibility of strnlen declaration */
 #        define _GNU_SOURCE
+#    endif
+
+#    if defined(__CYGWIN__)
+        /* Ensure visibility of Dl_info and pthread_setconcurrency declarations */
+#        define _GNU_SOURCE
 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */

include/wx/private/socket.h

@@ -65,7 +65,7 @@
 // 64 bit Cygwin can't use the standard struct timeval because it has long
 // fields, which are supposed to be 32 bits in Win64 API, but long is 64 bits
 // in 64 bit Cygwin, so we need to use its special __ms_timeval instead.
-#if defined(__CYGWIN__) && defined(__LP64__)
+#if defined(__CYGWIN__) && defined(__LP64__) && defined(__WINDOWS__)
     typedef __ms_timeval wxTimeVal_t;
 #else
     typedef timeval wxTimeVal_t;