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 /sql/mini_client.cc | |
| 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 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 5bd88e9b09a..5600983817b 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -294,11 +294,11 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, FD_SET(s, &sfds); tv.tv_sec = (long) to; tv.tv_usec = 0; -#ifdef HPUX +#ifdef HPUX10 res = select(s+1, NULL, (int*) &sfds, NULL, &tv); #else res = select(s+1, NULL, &sfds, NULL, &tv); -#endif +#endif /* HPUX10 */ if (res <= 0) /* Never became writable */ return(-1); |