diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-09-18 23:54:32 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-09-18 23:54:32 +1000 |
commit | c70ce7b09d8fd0b341c33e1b8d584a91bb241547 (patch) | |
tree | df54e90c40b0967fc52afb6caefb84ba09d5b8aa /openbsd-compat | |
parent | 9216c37d60fdb8b9e247541991248e0ca86cac07 (diff) |
- (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
Prevents macro redefinition warnings of "RDONLY".
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/port-aix.c | 10 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 14 |
2 files changed, 11 insertions, 13 deletions
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index d0a423005..b9fabf61f 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -45,6 +45,16 @@ | |||
45 | #include <string.h> | 45 | #include <string.h> |
46 | #include <unistd.h> | 46 | #include <unistd.h> |
47 | #include <sys/socket.h> | 47 | #include <sys/socket.h> |
48 | |||
49 | #ifdef WITH_AIXAUTHENTICATE | ||
50 | # include <login.h> | ||
51 | # include <userpw.h> | ||
52 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) | ||
53 | # include <sys/audit.h> | ||
54 | # endif | ||
55 | # include <usersec.h> | ||
56 | #endif | ||
57 | |||
48 | #include "port-aix.h" | 58 | #include "port-aix.h" |
49 | 59 | ||
50 | # ifdef HAVE_SETAUTHDB | 60 | # ifdef HAVE_SETAUTHDB |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 37b2c12b0..5a04bedad 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.26 2005/05/28 10:28:40 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.27 2006/09/18 13:54:33 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -31,18 +31,6 @@ | |||
31 | #ifdef HAVE_SYS_SOCKET_H | 31 | #ifdef HAVE_SYS_SOCKET_H |
32 | # include <sys/socket.h> | 32 | # include <sys/socket.h> |
33 | #endif | 33 | #endif |
34 | #ifdef HAVE_UNISTD_H | ||
35 | # include <unistd.h> /* for seteuid() */ | ||
36 | #endif | ||
37 | |||
38 | #ifdef WITH_AIXAUTHENTICATE | ||
39 | # include <login.h> | ||
40 | # include <userpw.h> | ||
41 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) | ||
42 | # include <sys/audit.h> | ||
43 | # endif | ||
44 | # include <usersec.h> | ||
45 | #endif | ||
46 | 34 | ||
47 | #include "buffer.h" | 35 | #include "buffer.h" |
48 | 36 | ||