28c28
< /* $Id: defines.h,v 1.138 2006/09/21 13:13:30 dtucker Exp $ */
---
> /* $Id: defines.h,v 1.151 2008/07/04 13:10:49 djm Exp $ */
71c71
< #ifndef MAXSYMLINKS
---
> #if defined(HAVE_DECL_MAXSYMLINKS) && HAVE_DECL_MAXSYMLINKS == 0
324,329d323
< #ifndef _PATH_CSHELL
< # define _PATH_CSHELL "/bin/csh"
< #endif
< #ifndef _PATH_SHELLS
< # define _PATH_SHELLS "/etc/shells"
< #endif
440,443d433
< #ifndef __dead
< # define __dead __attribute__((noreturn))
< #endif
<
451a442,445
> #if !defined(HAVE_ATTRIBUTE__NONNULL__) && !defined(__nonnull__)
> # define __nonnull__(x)
> #endif
>
490c484
< #ifndef offsetof
---
> #if defined(HAVE_DECL_OFFSETOF) && HAVE_DECL_OFFSETOF == 0
544a539,542
> #if defined(BROKEN_SHADOW_EXPIRE) && defined(HAS_SHADOW_EXPIRE)
> # undef HAS_SHADOW_EXPIRE
> #endif
>
568,572d565
< /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
< #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
< # define OPENSSL_free(x) Free(x)
< #endif
<
595a589,597
> #ifdef FSID_HAS_VAL
> /* encode f_fsid into a 64 bit value */
> #define FSID_TO_ULONG(f) \
> ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \
> ((f).val[1] & 0xffffffffUL))
> #else
> # define FSID_TO_ULONG(f) ((f))
> #endif
>
699c701
< #ifdef HAVE_LIBIAF
---
> #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID)
701a704,706
> #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)
> # define USE_LIBIAF
> #endif
731a737,740
> #ifndef EWOULDBLOCK
> # define EWOULDBLOCK EAGAIN
> #endif
>