mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
077840fa23
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged BUILD/SETUP.sh: Merged from 4.0 configure.in: Merged from 4.0 include/my_global.h: Merged from 4.0 include/my_pthread.h: Merged from 4.0 mysys/thr_alarm.c: Merged from 4.0 sql/mysqld.cc: Merged from 4.0 BUILD/SETUP.sh.rej: Merged from 4.0 configure.in.rej: Merged from 4.0 include/my_global.h.rej: Merged from 4.0 include/my_pthread.h.rej: Merged from 4.0 mysys/thr_alarm.c.rej: Merged from 4.0 sql/mysqld.cc.rej: Merged from 4.0
17 lines
344 B
Text
17 lines
344 B
Text
***************
|
|
*** 97,103 ****
|
|
|
|
|
|
/* Fix problem with S_ISLNK() on Linux */
|
|
! #if defined(HAVE_LINUXTHREADS)
|
|
#undef _GNU_SOURCE
|
|
#define _GNU_SOURCE 1
|
|
#endif
|
|
--- 97,103 ----
|
|
|
|
|
|
/* Fix problem with S_ISLNK() on Linux */
|
|
! #if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
|
|
#undef _GNU_SOURCE
|
|
#define _GNU_SOURCE 1
|
|
#endif
|