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 /openbsd-compat/port-aix.h | |
| parent | 5c6a91a39d83f2fe68de28d9635076dd4066d7e2 (diff) | |
| download | openssh-git-30317e37e4c3ba6b0a7c0b21f17760e4f45a6b12.tar.gz | |
- (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
undef'ing it.
Diffstat (limited to 'openbsd-compat/port-aix.h')
| -rw-r--r-- | openbsd-compat/port-aix.h | 5 |
1 files changed, 5 insertions, 0 deletions
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) |