summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-18 23:54:32 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-18 23:54:32 +1000
commitc70ce7b09d8fd0b341c33e1b8d584a91bb241547 (patch)
treedf54e90c40b0967fc52afb6caefb84ba09d5b8aa
parent9216c37d60fdb8b9e247541991248e0ca86cac07 (diff)
- (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
Prevents macro redefinition warnings of "RDONLY".
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/port-aix.c10
-rw-r--r--openbsd-compat/port-aix.h14
3 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f3d8d49f..e4318556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
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
David Bronder and Bernhard Simon.
+ - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
+ Prevents macro redefinition warnings of "RDONLY".
20060916
- OpenBSD CVS Sync
@@ -5455,4 +5457,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (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 $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index d0a42300..b9fabf61 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -45,6 +45,16 @@
#include <string.h>
#include <unistd.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"
# ifdef HAVE_SETAUTHDB
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 37b2c12b..5a04beda 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -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
# include <sys/socket.h>
#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"