mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Step 2 of the switch to support configuration with NPTL:
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. configure.in: Step 2 of the switch to support configuration with NPTL: Define a new CPP symbol that the target OS is Linux. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. include/my_global.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. mysys/thr_mutex.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. tools/mysqlmanager.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
This commit is contained in:
@ -97,7 +97,7 @@
|
||||
|
||||
|
||||
/* Fix problem with S_ISLNK() on Linux */
|
||||
#if defined(HAVE_LINUXTHREADS)
|
||||
#if defined(TARGET_OS_LINUX)
|
||||
#undef _GNU_SOURCE
|
||||
#define _GNU_SOURCE 1
|
||||
#endif
|
||||
@ -214,13 +214,13 @@ C_MODE_START int __cxa_pure_virtual() {\
|
||||
#endif
|
||||
|
||||
/* In Linux-alpha we have atomic.h if we are using gcc */
|
||||
#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)
|
||||
#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)
|
||||
#define HAVE_ATOMIC_ADD
|
||||
#define HAVE_ATOMIC_SUB
|
||||
#endif
|
||||
|
||||
/* In Linux-ia64 including atomic.h will give us an error */
|
||||
#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)
|
||||
#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)
|
||||
#undef HAVE_ATOMIC_ADD
|
||||
#undef HAVE_ATOMIC_SUB
|
||||
#endif
|
||||
@ -755,7 +755,7 @@ typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */
|
||||
error "Neither int or long is of 4 bytes width"
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
|
||||
#if !defined(HAVE_ULONG) && !defined(TARGET_OS_LINUX) && !defined(__USE_MISC)
|
||||
typedef unsigned long ulong; /* Short for unsigned long */
|
||||
#endif
|
||||
#ifndef longlong_defined
|
||||
|
Reference in New Issue
Block a user