diff options
| author | unknown <joerg@mysql.com> | 2005-04-26 12:16:12 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-26 12:16:12 +0200 |
| commit | 545063c30f6ff502bcd8c1414ab7bbcffe0a6656 (patch) | |
| tree | 534a0d7f2135d726ea938d3e1c4e5842f7d497d5 /include | |
| parent | a783db511b45fa0a99c583d23ea227fae4fcbc16 (diff) | |
| download | mariadb-git-545063c30f6ff502bcd8c1414ab7bbcffe0a6656.tar.gz | |
Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
config/ac-macros/openssl.m4:
"Configure" variable 'IS_LINUX' renamed to 'TARGET_LINUX'.
Manual merge: In 4.1, this was in 'acinclude.m4'.
include/my_global.h:
As we have a new CPP symbol, this should be "undef"ed explicitly.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 6cd1277d358..74846fe1762 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -107,6 +107,7 @@ #undef THREAD #undef HAVE_mit_thread #undef HAVE_LINUXTHREADS +#undef HAVE_NPTL #undef HAVE_UNIXWARE7_THREADS #endif |