diff options
| author | unknown <joerg@mysql.com> | 2005-04-26 12:03:37 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-26 12:03:37 +0200 |
| commit | a783db511b45fa0a99c583d23ea227fae4fcbc16 (patch) | |
| tree | 456de671941d212a8a4e3a9cea7082b09ca1d0fd /include/my_global.h | |
| parent | 22311d277511e5412c1dd3c3b70d7e4104c948ab (diff) | |
| parent | 8a9c988122135441d35bbab1b70c3e0ccb88b7a4 (diff) | |
| download | mariadb-git-a783db511b45fa0a99c583d23ea227fae4fcbc16.tar.gz | |
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Automerge / manual check.
configure.in:
Automerge / manual check.
include/my_global.h:
Automerge / manual check.
myisam/Makefile.am:
Automerge / manual check.
scripts/Makefile.am:
Automerge / manual check.
scripts/mysqld_safe.sh:
Automerge / manual check.
support-files/Makefile.am:
Automerge / manual check.
tools/mysqlmanager.c:
Automerge / manual check.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 7ec04377864..6cd1277d358 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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 @@ -246,13 +246,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 @@ -799,7 +799,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 |