diff options
author | Damien Miller <djm@mindrot.org> | 2006-07-24 14:51:00 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-07-24 14:51:00 +1000 |
commit | b8fe89c4d97ea9a5d7efb2c60108b8a7644f6a49 (patch) | |
tree | 60e9457b39b992a0bf19488f5e92d57d35b6fdb5 /defines.h | |
parent | d8337c5e609b3bafda0008aef2636d6f17c622ef (diff) |
- (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]
[canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
[gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
[servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
[ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
[openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
[openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
[openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
[openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
[openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
make the portable tree compile again - sprinkle unistd.h and string.h
back in. Don't redefine __unused, as it turned out to be used in
headers on Linux, and replace its use in auth-pam.c with ARGSUSED
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.133 2006/07/12 04:14:31 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.134 2006/07/24 04:51:01 djm Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -143,16 +143,11 @@ including rpc/rpc.h breaks Solaris 6 | |||
143 | #define INADDR_LOOPBACK ((u_long)0x7f000001) | 143 | #define INADDR_LOOPBACK ((u_long)0x7f000001) |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | #ifndef __unused | ||
147 | #define __unused | ||
148 | #endif | ||
149 | |||
150 | /* Types */ | 146 | /* Types */ |
151 | 147 | ||
152 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ | 148 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ |
153 | /* (or die trying) */ | 149 | /* (or die trying) */ |
154 | 150 | ||
155 | |||
156 | #ifndef HAVE_U_INT | 151 | #ifndef HAVE_U_INT |
157 | typedef unsigned int u_int; | 152 | typedef unsigned int u_int; |
158 | #endif | 153 | #endif |