diff options
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 32 |
1 files changed, 21 insertions, 11 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.143 2007/08/09 04:37:52 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.151 2008/07/04 13:10:49 djm Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -431,10 +431,6 @@ struct winsize { | |||
431 | # define __attribute__(x) | 431 | # define __attribute__(x) |
432 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ | 432 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ |
433 | 433 | ||
434 | #ifndef __dead | ||
435 | # define __dead __attribute__((noreturn)) | ||
436 | #endif | ||
437 | |||
438 | #if !defined(HAVE_ATTRIBUTE__SENTINEL__) && !defined(__sentinel__) | 434 | #if !defined(HAVE_ATTRIBUTE__SENTINEL__) && !defined(__sentinel__) |
439 | # define __sentinel__ | 435 | # define __sentinel__ |
440 | #endif | 436 | #endif |
@@ -540,6 +536,10 @@ struct winsize { | |||
540 | # undef HAVE_UPDWTMPX | 536 | # undef HAVE_UPDWTMPX |
541 | #endif | 537 | #endif |
542 | 538 | ||
539 | #if defined(BROKEN_SHADOW_EXPIRE) && defined(HAS_SHADOW_EXPIRE) | ||
540 | # undef HAS_SHADOW_EXPIRE | ||
541 | #endif | ||
542 | |||
543 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) && \ | 543 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) && \ |
544 | defined(SYSLOG_R_SAFE_IN_SIGHAND) | 544 | defined(SYSLOG_R_SAFE_IN_SIGHAND) |
545 | # define DO_LOG_SAFE_IN_SIGHAND | 545 | # define DO_LOG_SAFE_IN_SIGHAND |
@@ -563,11 +563,6 @@ struct winsize { | |||
563 | # define CUSTOM_SSH_AUDIT_EVENTS | 563 | # define CUSTOM_SSH_AUDIT_EVENTS |
564 | #endif | 564 | #endif |
565 | 565 | ||
566 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ | ||
567 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) | ||
568 | # define OPENSSL_free(x) Free(x) | ||
569 | #endif | ||
570 | |||
571 | #if !defined(HAVE___func__) && defined(HAVE___FUNCTION__) | 566 | #if !defined(HAVE___func__) && defined(HAVE___FUNCTION__) |
572 | # define __func__ __FUNCTION__ | 567 | # define __func__ __FUNCTION__ |
573 | #elif !defined(HAVE___func__) | 568 | #elif !defined(HAVE___func__) |
@@ -591,6 +586,15 @@ struct winsize { | |||
591 | # define SSH_SYSFDMAX 10000 | 586 | # define SSH_SYSFDMAX 10000 |
592 | #endif | 587 | #endif |
593 | 588 | ||
589 | #ifdef FSID_HAS_VAL | ||
590 | /* encode f_fsid into a 64 bit value */ | ||
591 | #define FSID_TO_ULONG(f) \ | ||
592 | ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ | ||
593 | ((f).val[1] & 0xffffffffUL)) | ||
594 | #else | ||
595 | # define FSID_TO_ULONG(f) ((f)) | ||
596 | #endif | ||
597 | |||
594 | #if defined(__Lynx__) | 598 | #if defined(__Lynx__) |
595 | /* | 599 | /* |
596 | * LynxOS defines these in param.h which we do not want to include since | 600 | * LynxOS defines these in param.h which we do not want to include since |
@@ -694,9 +698,11 @@ struct winsize { | |||
694 | # define CUSTOM_SYS_AUTH_PASSWD 1 | 698 | # define CUSTOM_SYS_AUTH_PASSWD 1 |
695 | #endif | 699 | #endif |
696 | 700 | ||
701 | #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) | ||
702 | # define CUSTOM_SYS_AUTH_PASSWD 1 | ||
703 | #endif | ||
697 | #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) | 704 | #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) |
698 | # define USE_LIBIAF | 705 | # define USE_LIBIAF |
699 | # define CUSTOM_SYS_AUTH_PASSWD 1 | ||
700 | #endif | 706 | #endif |
701 | 707 | ||
702 | /* HP-UX 11.11 */ | 708 | /* HP-UX 11.11 */ |
@@ -728,4 +734,8 @@ struct winsize { | |||
728 | # endif | 734 | # endif |
729 | #endif | 735 | #endif |
730 | 736 | ||
737 | #ifndef EWOULDBLOCK | ||
738 | # define EWOULDBLOCK EAGAIN | ||
739 | #endif | ||
740 | |||
731 | #endif /* _DEFINES_H */ | 741 | #endif /* _DEFINES_H */ |