summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-10-24 14:30:25 +0200
committerunknown <lenz@mysql.com>2002-10-24 14:30:25 +0200
commit6f043c359cd6510057872e6e47fbb6ce8e591d1c (patch)
tree2f40701031727d38957abb36f9e566d09b47ec9f /include
parent68a5932ab2b5e39858fa03934cbbe5c90042497e (diff)
downloadmariadb-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 'include')
-rw-r--r--include/my_global.h2
-rw-r--r--include/my_net.h4
-rw-r--r--include/my_pthread.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h
index d1b3c516555..3f018ab73cb 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -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
diff --git a/include/my_net.h b/include/my_net.h
index 2f5743923cf..ec985ded76b 100644
--- a/include/my_net.h
+++ b/include/my_net.h
@@ -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) */
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 9b7812b7cf2..f75ca8f601a 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -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,