diff options
| author | unknown <jimw@mysql.com> | 2005-09-12 17:00:50 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-12 17:00:50 -0700 |
| commit | 8dc5c95b144e421475bf70d985a37b0ebd4d6180 (patch) | |
| tree | 1ad89ca3921996790f4f78584fb66bf871991e26 /include/my_pthread.h | |
| parent | 74aeffda533697d88f19dabc86ffd8fcc19a8f7f (diff) | |
| parent | accf5c264a4e42fb966473453aa80b1f28d87946 (diff) | |
| download | mariadb-git-8dc5c95b144e421475bf70d985a37b0ebd4d6180.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
Diffstat (limited to 'include/my_pthread.h')
| -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 47a38d1a642..132a298bc69 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 |