- (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.

Prevents macro redefinition warnings of "RDONLY".
This commit is contained in:
Darren Tucker 2006-09-18 23:54:32 +10:00
parent 9216c37d60
commit c70ce7b09d
3 changed files with 14 additions and 14 deletions

View File

@ -3,6 +3,8 @@
macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags. macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags.
Allows build out of the box with older VAC and XLC compilers. Found by Allows build out of the box with older VAC and XLC compilers. Found by
David Bronder and Bernhard Simon. David Bronder and Bernhard Simon.
- (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
Prevents macro redefinition warnings of "RDONLY".
20060916 20060916
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5455,4 +5457,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4551 2006/09/18 13:17:40 dtucker Exp $ $Id: ChangeLog,v 1.4552 2006/09/18 13:54:32 dtucker Exp $

View File

@ -45,6 +45,16 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef WITH_AIXAUTHENTICATE
# include <login.h>
# include <userpw.h>
# if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG)
# include <sys/audit.h>
# endif
# include <usersec.h>
#endif
#include "port-aix.h" #include "port-aix.h"
# ifdef HAVE_SETAUTHDB # ifdef HAVE_SETAUTHDB

View File

@ -1,4 +1,4 @@
/* $Id: port-aix.h,v 1.26 2005/05/28 10:28:40 dtucker Exp $ */ /* $Id: port-aix.h,v 1.27 2006/09/18 13:54:33 dtucker Exp $ */
/* /*
* *
@ -31,18 +31,6 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* for seteuid() */
#endif
#ifdef WITH_AIXAUTHENTICATE
# include <login.h>
# include <userpw.h>
# if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG)
# include <sys/audit.h>
# endif
# include <usersec.h>
#endif
#include "buffer.h" #include "buffer.h"