diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-07-14 16:26:51 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-14 16:26:51 +1000 |
| commit | 30317e37e4c3ba6b0a7c0b21f17760e4f45a6b12 (patch) | |
| tree | 925f09ce92f2e71463e7bc6c47edfb55c2c4e717 | |
| parent | 5c6a91a39d83f2fe68de28d9635076dd4066d7e2 (diff) | |
- (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
undef'ing it.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | openbsd-compat/port-aix.h | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,6 +1,8 @@ 20030714 - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare loginfailed at all, so assume 3-arg loginfailed if not declared. + - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by + undef'ing it. 20030708 - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] @@ -674,4 +676,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2850 2003/07/14 06:21:44 dtucker Exp $ +$Id: ChangeLog,v 1.2851 2003/07/14 06:26:51 dtucker Exp $ diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 4627a82f..2e5def54 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -35,6 +35,11 @@ # endif #endif +/* Some versions define r_type in the above headers, which causes a conflict */ +#ifdef r_type +# undef r_type +#endif + /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) # define nanosleep(a,b) nsleep(a,b) |