Attachment #515034 for bug #644748

Lines 2036-2042 Link Here

(-)a/src/corelib/global/qglobal.cpp (-1 / +1 lines)
2036	}	2036	}
2037	#endif	2037	#endif
2038		2038
2039	#elif defined(Q_OS_WIN) \|\| defined(Q_OS_CYGWIN) \|\| defined(Q_OS_WINRT)	2039	#elif defined(Q_OS_WIN) \|\| defined(Q_OS_WINRT)
2040		2040
2041	QT_BEGIN_INCLUDE_NAMESPACE	2041	QT_BEGIN_INCLUDE_NAMESPACE
2042	#include "qt_windows.h"	2042	#include "qt_windows.h"

Lines 212-218 Link Here

(-)a/src/corelib/global/qsysinfo.h (-1 / +1 lines)
212		212
213	QT_WARNING_PUSH	213	QT_WARNING_PUSH
214	QT_WARNING_DISABLE_DEPRECATED	214	QT_WARNING_DISABLE_DEPRECATED
215	#if defined(Q_OS_WIN) \|\| defined(Q_OS_CYGWIN)	215	#if defined(Q_OS_WIN)
216	QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const WinVersion WindowsVersion;	216	QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const WinVersion WindowsVersion;
217	QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static WinVersion windowsVersion();	217	QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static WinVersion windowsVersion();
218	#else	218	#else

Lines 125-130 Link Here

(-)a/src/corelib/global/qsystemdetection.h (+1 lines)
125	# define Q_OS_LINUX	125	# define Q_OS_LINUX
126	#elif defined(__CYGWIN__)	126	#elif defined(__CYGWIN__)
127	# define Q_OS_CYGWIN	127	# define Q_OS_CYGWIN
		128	# define Q_OS_LINUX
128	#elif !defined(SAG_COM) && (!defined(WINAPI_FAMILY) \|\| WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP) && (defined(WIN64) \|\| defined(_WIN64) \|\| defined(__WIN64__))	129	#elif !defined(SAG_COM) && (!defined(WINAPI_FAMILY) \|\| WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP) && (defined(WIN64) \|\| defined(_WIN64) \|\| defined(__WIN64__))
129	# define Q_OS_WIN32	130	# define Q_OS_WIN32
130	# define Q_OS_WIN64	131	# define Q_OS_WIN64

Lines 156-166 Link Here

(-)a/src/corelib/plugin/qlibrary_unix.cpp (-2 lines)
156	if (loadHints & QLibrary::ExportExternalSymbolsHint) {	156	if (loadHints & QLibrary::ExportExternalSymbolsHint) {
157	dlFlags \|= RTLD_GLOBAL;	157	dlFlags \|= RTLD_GLOBAL;
158	}	158	}
159	#if !defined(Q_OS_CYGWIN)
160	else {	159	else {
161	dlFlags \|= RTLD_LOCAL;	160	dlFlags \|= RTLD_LOCAL;
162	}	161	}
163	#endif
164	#if defined(RTLD_DEEPBIND)	162	#if defined(RTLD_DEEPBIND)
165	if (loadHints & QLibrary::DeepBindHint)	163	if (loadHints & QLibrary::DeepBindHint)
166	dlFlags \|= RTLD_DEEPBIND;	164	dlFlags \|= RTLD_DEEPBIND;




#  define _GNU_SOURCE
#endif

// On Cygwin features.h is sometimes pre-included, and sets __GNU_VISIBLE to 0.
#if defined(__GNU_VISIBLE)
#  if 0 == __GNU_VISIBLE
#    undef __GNU_VISIBLE
#    define __GNU_VISIBLE 1
#  endif
#else
   // It is included too late in unistd.h
#  include <features.h>
#endif

#include <unistd.h>



Lines 51-56 Link Here

(-)a/src/corelib/global/qglobal_p.h (+1 lines)
51	// We mean it.	51	// We mean it.
52	//	52	//
53		53
		54	#include "qplatformdefs.h"
54	#include "qglobal.h"	55	#include "qglobal.h"
55	#include "qglobal_p.h" // include self to avoid syncqt warning - no-op	56	#include "qglobal_p.h" // include self to avoid syncqt warning - no-op
56		57

Lines 61-68 Link Here

(-)a/src/corelib/thread/qmutex_p.h (-2 / +2 lines)
61		61
62	#if defined(Q_OS_MAC)	62	#if defined(Q_OS_MAC)
63	# include <mach/semaphore.h>	63	# include <mach/semaphore.h>
64	#elif defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)	64	#elif defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_CYGWIN)
65	// use Linux mutexes everywhere except for LSB builds	65	// use Linux mutexes everywhere except for LSB builds and Cygwin
66	# define QT_LINUX_FUTEX	66	# define QT_LINUX_FUTEX
67	#elif defined(Q_OS_UNIX)	67	#elif defined(Q_OS_UNIX)
68	# if _POSIX_VERSION-0 >= 200112L \|\| _XOPEN_VERSION-0 >= 600	68	# if _POSIX_VERSION-0 >= 200112L \|\| _XOPEN_VERSION-0 >= 600




**
****************************************************************************/

#include "qthread.h"

#include "qplatformdefs.h"

#include "qthread.h"

#include <private/qcoreapplication_p.h>
#include <private/qcore_unix_p.h>


# endif
#endif

#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_CYGWIN)
#include <sys/prctl.h>
#endif


#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
static void setCurrentThreadName(pthread_t threadId, const char *name)
{
#  if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_CYGWIN)
    Q_UNUSED(threadId);
    prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
#  elif defined(Q_OS_MAC)
    Q_UNUSED(threadId);
    pthread_setname_np(name);
#  elif defined(Q_OS_QNX) || defined(Q_OS_CYGWIN)
    pthread_setname_np(threadId, name);
#  endif
}

Lines 98-104 Link Here

(-)a/src/corelib/io/qstorageinfo_unix.cpp (-1 / +1 lines)
98	# define QT_STATFSBUF struct statvfs	98	# define QT_STATFSBUF struct statvfs
99	# define QT_STATFS ::statvfs	99	# define QT_STATFS ::statvfs
100	#else	100	#else
101	# if defined(QT_LARGEFILE_SUPPORT)	101	# if defined(QT_LARGEFILE_SUPPORT) && !defined(Q_OS_CYGWIN)
102	# define QT_STATFSBUF struct statvfs64	102	# define QT_STATFSBUF struct statvfs64
103	# define QT_STATFS ::statvfs64	103	# define QT_STATFS ::statvfs64
104	# else	104	# else

Lines 38-43 Link Here

(-)a/src/corelib/kernel/qelapsedtimer_unix.cpp (+1 lines)
38	**	38	**
39	****************************************************************************/	39	****************************************************************************/
40		40
		41	#include "qplatformdefs.h"
41	#include "qelapsedtimer.h"	42	#include "qelapsedtimer.h"
42	#include "qdeadlinetimer.h"	43	#include "qdeadlinetimer.h"
43	#include "qdeadlinetimer_p.h"	44	#include "qdeadlinetimer_p.h"

Lines 49-55 Link Here

(-)a/src/corelib/io/qfilesystemwatcher.cpp (-1 / +1 lines)
49	#include <qset.h>	49	#include <qset.h>
50	#include <qtimer.h>	50	#include <qtimer.h>
51		51
52	#if defined(Q_OS_LINUX) \|\| (defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY))	52	#if (defined(Q_OS_LINUX) \|\| (defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY))) && !defined(Q_OS_CYGWIN)
53	#define USE_INOTIFY	53	#define USE_INOTIFY
54	#endif	54	#endif
55		55

Lines 62-68 Link Here

(-)a/src/corelib/global/qversiontagging.h (-1 / +1 lines)
62		62
63	#if defined(QT_BUILD_CORE_LIB) \|\| defined(QT_BOOTSTRAPPED) \|\| defined(QT_NO_VERSION_TAGGING) \|\| defined(QT_STATIC)	63	#if defined(QT_BUILD_CORE_LIB) \|\| defined(QT_BOOTSTRAPPED) \|\| defined(QT_NO_VERSION_TAGGING) \|\| defined(QT_STATIC)
64	// don't make tags in QtCore, bootstrapped systems or if the user asked not to	64	// don't make tags in QtCore, bootstrapped systems or if the user asked not to
65	#elif defined(Q_CC_GNU) && !defined(Q_OS_ANDROID)	65	#elif defined(Q_CC_GNU) && !defined(Q_OS_ANDROID) && !defined(Q_OS_CYGWIN)
66	# if defined(Q_PROCESSOR_X86) && (defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD_KERNEL))	66	# if defined(Q_PROCESSOR_X86) && (defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD_KERNEL))
67	# if defined(Q_PROCESSOR_X86_64) && QT_POINTER_SIZE == 8 // x86-64 64-bit	67	# if defined(Q_PROCESSOR_X86_64) && QT_POINTER_SIZE == 8 // x86-64 64-bit
68	# define QT_VERSION_TAG_RELOC(sym) ".quad " QT_STRINGIFY(QT_MANGLE_NAMESPACE(sym)) "@GOT\n"	68	# define QT_VERSION_TAG_RELOC(sym) ".quad " QT_STRINGIFY(QT_MANGLE_NAMESPACE(sym)) "@GOT\n"

Return to bug 644748

Lines 53-58 Link Here

(-)a/mkspecs/cygwin-g++/qplatformdefs.h (+11 lines)
53	# define _GNU_SOURCE	53	# define _GNU_SOURCE
54	#endif	54	#endif
55		55
		56	// On Cygwin features.h is sometimes pre-included, and sets __GNU_VISIBLE to 0.
		57	#if defined(__GNU_VISIBLE)
		58	# if 0 == __GNU_VISIBLE
		59	# undef __GNU_VISIBLE
		60	# define __GNU_VISIBLE 1
		61	# endif
		62	#else
		63	// It is included too late in unistd.h
		64	# include <features.h>
		65	#endif
		66
56	#include <unistd.h>	67	#include <unistd.h>
57		68
58		69

Lines 38-47 Link Here

(-)a/src/corelib/thread/qthread_unix.cpp (-5 / +5 lines)
38	**	38	**
39	****************************************************************************/	39	****************************************************************************/
40		40
41	#include "qthread.h"
42
43	#include "qplatformdefs.h"	41	#include "qplatformdefs.h"
44		42
		43	#include "qthread.h"
		44
45	#include <private/qcoreapplication_p.h>	45	#include <private/qcoreapplication_p.h>
46	#include <private/qcore_unix_p.h>	46	#include <private/qcore_unix_p.h>
47		47
Lines 92-98 Link Here
92	# endif	92	# endif
93	#endif	93	#endif
94		94
95	#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)	95	#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_CYGWIN)
96	#include <sys/prctl.h>	96	#include <sys/prctl.h>
97	#endif	97	#endif
98		98
Lines 305-317 Link Here
305	#if (defined(Q_OS_LINUX) \|\| defined(Q_OS_MAC) \|\| defined(Q_OS_QNX))	305	#if (defined(Q_OS_LINUX) \|\| defined(Q_OS_MAC) \|\| defined(Q_OS_QNX))
306	static void setCurrentThreadName(pthread_t threadId, const char *name)	306	static void setCurrentThreadName(pthread_t threadId, const char *name)
307	{	307	{
308	# if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)	308	# if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_CYGWIN)
309	Q_UNUSED(threadId);	309	Q_UNUSED(threadId);
310	prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);	310	prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
311	# elif defined(Q_OS_MAC)	311	# elif defined(Q_OS_MAC)
312	Q_UNUSED(threadId);	312	Q_UNUSED(threadId);
313	pthread_setname_np(name);	313	pthread_setname_np(name);
314	# elif defined(Q_OS_QNX)	314	# elif defined(Q_OS_QNX) \|\| defined(Q_OS_CYGWIN)
315	pthread_setname_np(threadId, name);	315	pthread_setname_np(threadId, name);
316	# endif	316	# endif
317	}	317	}