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 @@ | |||
1 | 20030714 | 1 | 20030714 |
2 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare | 2 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare |
3 | loginfailed at all, so assume 3-arg loginfailed if not declared. | 3 | loginfailed at all, so assume 3-arg loginfailed if not declared. |
4 | - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by | ||
5 | undef'ing it. | ||
4 | 6 | ||
5 | 20030708 | 7 | 20030708 |
6 | - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] | 8 | - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] |
@@ -674,4 +676,4 @@ | |||
674 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 676 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
675 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 677 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
676 | 678 | ||
677 | $Id: ChangeLog,v 1.2850 2003/07/14 06:21:44 dtucker Exp $ | 679 | $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 4627a82f0..2e5def54e 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -35,6 +35,11 @@ | |||
35 | # endif | 35 | # endif |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | /* Some versions define r_type in the above headers, which causes a conflict */ | ||
39 | #ifdef r_type | ||
40 | # undef r_type | ||
41 | #endif | ||
42 | |||
38 | /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ | 43 | /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ |
39 | #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) | 44 | #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) |
40 | # define nanosleep(a,b) nsleep(a,b) | 45 | # define nanosleep(a,b) nsleep(a,b) |