diff options
| author | monty@hundin.mysql.fi <> | 2002-08-18 16:07:19 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-18 16:07:19 +0300 |
| commit | 48e20a0be2e15101871bdda6b829215397f1c3e6 (patch) | |
| tree | 758eccbf4fc1144e2c3ff7ccccdcbd663b569876 | |
| parent | 65334e1c588be4a07728d924ddfafe400622cfb3 (diff) | |
| download | mariadb-git-48e20a0be2e15101871bdda6b829215397f1c3e6.tar.gz | |
Portability fixes for HPUX and Openbsd
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | innobase/configure.in | 2 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index f0201334221..e9c8b593f91 100644 --- a/configure.in +++ b/configure.in @@ -851,7 +851,7 @@ case $SYSTEM_TYPE in *hpux10.20*) echo "Enabling workarounds for hpux 10.20" CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX" - CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT HAVE_POSIX1003_4a_MUTEX" + CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX" if test "$with_named_thread" = "no" then echo "Using --with-named-thread=-lpthread" diff --git a/innobase/configure.in b/innobase/configure.in index 48787b680b2..e4e5d839246 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -96,6 +96,8 @@ case "$target_os" in sysv5uw7*) # Problem when linking on SCO CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + openbsd*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; esac case "$target" in diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 61dc2be8293..ecd3631f59d 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -388,11 +388,11 @@ int pthread_signal(int sig, void (*func)()) #undef pthread_mutex_destroy #undef pthread_mutex_wait #undef pthread_mutex_timedwait +#undef pthread_mutex_trylock #undef pthread_mutex_t +#undef pthread_cond_init #undef pthread_cond_wait #undef pthread_cond_timedwait -#undef pthread_mutex_trylock -#undef pthread_mutex_t #undef pthread_cond_t |