RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [port-aix.h] Work around name collision on AIX for r_type by 

undef'ing it.
This commit is contained in:
Darren Tucker 2003-07-14 16:26:51 +10:00
parent 5c6a91a39d
commit 30317e37e4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20030714 20030714
- (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
loginfailed at all, so assume 3-arg loginfailed if not declared. 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 20030708
- (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

5
openbsd-compat/port-aix.h
View File

@ -35,6 +35,11 @@
# endif # endif
#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 */ /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */
#if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP)
# define nanosleep(a,b) nsleep(a,b) # define nanosleep(a,b) nsleep(a,b)