Commit 9b769dbd authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual 

   differences in HPUX11)
parent dd0e3427

acconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
#undef SPRINTF_RETURNS_INT

#undef SPRINTF_RETURNS_GARBAGE



/* Needed to get large file supportat HPUX 10.20 */

/* Needed to get large file support on HPUX 10.20 */

#undef __STDC_EXT__



#undef STACK_DIRECTION

configure.in

+4 −4
Original line number Diff line number Diff line
@@ -914,8 +914,8 @@ 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 -DHAVE_POSIX1003_4a_MUTEX"

    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -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 -DHPUX10 -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"
@@ -924,8 +924,8 @@ case $SYSTEM_TYPE in 
    ;;

  *hpux11.*)

    echo "Enabling workarounds for hpux 11"

    CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CFLAGS="$CFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CXXFLAGS="$CXXFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    if test "$with_named_thread" = "no"

    then 

      echo "Using --with-named-thread=-lpthread"

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 
#ifdef DONT_USE_FINITE		/* HPUX 11.x has is_finite() */

#undef HAVE_FINITE

#endif

#if defined(HPUX) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)

#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)

/* Fix bug in setrlimit */

#undef setrlimit

#define setrlimit cma_setrlimit64

include/my_net.h

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void my_inet_ntoa(struct in_addr in, char *buf); 
  Handling of gethostbyname_r()

*/



#if !defined(HPUX)

#if !defined(HPUX10)

struct hostent;

#endif /* HPUX */

#if !defined(HAVE_GETHOSTBYNAME_R)
@@ -84,7 +84,7 @@ struct hostent *my_gethostbyname_r(const char *name, 
				   struct hostent *result, char *buffer,

				   int buflen, int *h_errnop);

#define my_gethostbyname_r_free()

#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) && !defined(HPUX)

#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) && !defined(HPUX10)

#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)

#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); 


#endif /* defined(__WIN__) */



#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)

#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)

#undef pthread_cond_timedwait

#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))

int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,