From: dtucker <dtucker>
Date: Mon, 18 Sep 2006 13:54:32 +0000 (+0000)
Subject:  - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
X-Git-Tag: V_4_4_P1~11
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/d9ed544bbdeeecbd30c9483ecda4cc7fc6adbacf

 - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
   Prevents macro redefinition warnings of "RDONLY".
---

diff --git a/ChangeLog b/ChangeLog
index c1de453a..5aea0d00 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
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 89746f73..eae82a9e 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -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"