Commit 48e20a0b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes for HPUX and Openbsd

parent 65334e1c

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

innobase/configure.in

+2 −0
Original line number Diff line number Diff line
@@ -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

mysys/my_pthread.c

+2 −2
Original line number Diff line number Diff line
@@ -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