diff options
| author | Tim Rice <tim@multitalents.net> | 2002-02-26 17:40:48 +0100 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2002-02-26 17:40:48 +0100 |
| commit | 4cec93faed6586dd48b02030b77c094e0730b62e (patch) | |
| tree | 5aac3fe80d5d789508d21ebc8f230243fb83e188 /defines.h | |
| parent | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() (diff) | |
| download | openssh-4cec93faed6586dd48b02030b77c094e0730b62e.tar.xz openssh-4cec93faed6586dd48b02030b77c094e0730b62e.zip | |
Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
based on patch by mooney@dogbert.cc.ndsu.nodak.edu (Tim Mooney)
Bug 45 [configure.ac] modify skey test to work around conflict with autoconf
reported by nolan@naic.edu (Michael Nolan)
patch by Pekka Savola <pekkas@netcore.fi>
Bug 74 [configure.ac defines.h] add sig_atomic_t test
reported by dwd@bell-labs.com (Dave Dykstra)
Bug 102 [defines.h] UNICOS fixes. patch by wendyp@cray.com
[configure.ac Makefile.in] link libwrap only with sshd
based on patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>
Bug 123 link libpam only with sshd
reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky)
[configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
[acconfig.h] remove unused HAVE_REGCOMP
Diffstat (limited to 'defines.h')
| -rw-r--r-- | defines.h | 26 |
1 files changed, 22 insertions, 4 deletions
@@ -1,7 +1,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.79 2002/02/13 18:14:53 tim Exp $ */ +/* $Id: defines.h,v 1.80 2002/02/26 16:40:49 tim Exp $ */ /* Necessary headers */ @@ -11,9 +11,6 @@ #include <netinet/in_systm.h> /* For typedefs */ #include <netinet/in.h> /* For IPv6 macros */ #include <netinet/ip.h> /* For IPTOS macros */ -#ifdef HAVE_RPC_RPC_H -# include <rpc/rpc.h> /* For INADDR_LOOPBACK on SCO OSR3 */ -#endif #ifdef HAVE_SYS_UN_H # include <sys/un.h> /* For sockaddr_un */ #endif @@ -144,6 +141,14 @@ enum # define NFDBITS (8 * sizeof(unsigned long)) #endif +/* +SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but +including rpc/rpc.h breaks Solaris 6 +*/ +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK ((ulong)0x7f000001) +#endif + /* Types */ /* If sys/types.h does not supply intXX_t, supply them ourselves */ @@ -164,7 +169,11 @@ typedef char int8_t; typedef short int int16_t; # else # ifdef _CRAY +# if (SIZEOF_SHORT_INT == 4) +typedef short int16_t; +# else typedef long int16_t; +# endif # else # error "16 bit int type not found." # endif /* _CRAY */ @@ -197,7 +206,11 @@ typedef unsigned char u_int8_t; typedef unsigned short int u_int16_t; # else # ifdef _CRAY +# if (SIZEOF_SHORT_INT == 4) +typedef unsigned short u_int16_t; +# else typedef unsigned long u_int16_t; +# endif # else # error "16 bit int type not found." # endif @@ -272,6 +285,11 @@ typedef int pid_t; # define HAVE_PID_T #endif /* HAVE_PID_T */ +#ifndef HAVE_SIG_ATOMIC_T +typedef int sig_atomic_t; +# define HAVE_SIG_ATOMIC_T +#endif /* HAVE_SIG_ATOMIC_T */ + #ifndef HAVE_MODE_T typedef int mode_t; # define HAVE_MODE_T |