diff options
| author | unknown <jimw@mysql.com> | 2005-09-12 10:19:56 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-12 10:19:56 -0700 |
| commit | 4975a7f9f8a1c3029d069651abbbfdc653ae7945 (patch) | |
| tree | 6708142a5301857bc0c8c3c9db7bf0e8e98ea2a0 /include | |
| parent | 17233698fcf91f482419ece675f2d747fae9f501 (diff) | |
| parent | da5a9926e1747b482fa7236bf794b4b605b21bf6 (diff) | |
| download | mariadb-git-4975a7f9f8a1c3029d069651abbbfdc653ae7945.tar.gz | |
Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
into mysql.com:/home/jimw/my/mysql-4.1-clean
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index fde62655c5f..d83ddf62a80 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -298,11 +298,6 @@ extern int my_pthread_create_detached; int sigwait(sigset_t *set, int *sig); #endif -#if defined(HAVE_UNIXWARE7_POSIX) -#undef HAVE_NONPOSIX_SIGWAIT -#define HAVE_NONPOSIX_SIGWAIT /* sigwait takes only 1 argument */ -#endif - #ifndef HAVE_NONPOSIX_SIGWAIT #define my_sigwait(A,B) sigwait((A),(B)) #else |