diff options
| author | unknown <lenz@mysql.com> | 2002-10-24 14:30:25 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-10-24 14:30:25 +0200 |
| commit | 6f043c359cd6510057872e6e47fbb6ce8e591d1c (patch) | |
| tree | 2f40701031727d38957abb36f9e566d09b47ec9f /mysys | |
| parent | 68a5932ab2b5e39858fa03934cbbe5c90042497e (diff) | |
| download | mariadb-git-6f043c359cd6510057872e6e47fbb6ce8e591d1c.tar.gz | |
- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)
acconfig.h:
- fixed typo
configure.in:
- replaced HPUX -> HPUX10
- added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
- replaced HPUX -> HPUX10
include/my_net.h:
- replaced HPUX -> HPUX10
include/my_pthread.h:
- replaced HPUX -> HPUX10
libmysql/libmysql.c:
- replaced HPUX -> HPUX10
mysys/my_append.c:
- replaced HPUX -> HPUX10
mysys/my_copy.c:
- replaced HPUX -> HPUX10
mysys/my_pthread.c:
- replaced HPUX -> HPUX10
mysys/my_redel.c:
- replaced HPUX -> HPUX10
mysys/thr_alarm.c:
- replaced HPUX -> HPUX10
sql/mini_client.cc:
- replaced HPUX -> HPUX10
sql/mysqld.cc:
- replaced HPUX -> HPUX10
strings/do_ctype.c:
- replaced HPUX -> HPUX10
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_append.c | 2 | ||||
| -rw-r--r-- | mysys/my_copy.c | 2 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 2 | ||||
| -rw-r--r-- | mysys/my_redel.c | 2 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mysys/my_append.c b/mysys/my_append.c index 2e08b4b4c05..dc5ed084bb3 100644 --- a/mysys/my_append.c +++ b/mysys/my_append.c @@ -22,7 +22,7 @@ #include <sys/utime.h> #elif defined(HAVE_UTIME_H) #include <utime.h> -#elif !defined(HPUX) +#elif !defined(HPUX10) struct utimbuf { time_t actime; time_t modtime; diff --git a/mysys/my_copy.c b/mysys/my_copy.c index 253608c5306..a899835ea62 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -22,7 +22,7 @@ #include <sys/utime.h> #elif defined(HAVE_UTIME_H) #include <utime.h> -#elif !defined(HPUX) +#elif !defined(HPUX10) #include <time.h> struct utimbuf { time_t actime; diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 54a5c71c695..07e8ecec6ac 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -435,7 +435,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) this has to be added here. ****************************************************************************/ -#if defined(HPUX) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) +#if defined(HPUX10) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *abstime) diff --git a/mysys/my_redel.c b/mysys/my_redel.c index 8474dab0d13..b5a79d9454b 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.c @@ -23,7 +23,7 @@ #include <sys/utime.h> #elif defined(HAVE_UTIME_H) #include <utime.h> -#elif !defined(HPUX) +#elif !defined(HPUX10) struct utimbuf { time_t actime; time_t modtime; diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index d1343d4c2d3..ed468b5ef50 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -730,11 +730,11 @@ static pthread_cond_t COND_thread_count; static pthread_mutex_t LOCK_thread_count; static uint thread_count; -#ifdef HPUX +#ifdef HPUX10 typedef int * fd_set_ptr; #else typedef fd_set * fd_set_ptr; -#endif /* HPUX */ +#endif /* HPUX10 */ static void *test_thread(void *arg) { |