diff options
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 27 |
1 files changed, 21 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.176 2014/01/17 13:12:38 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.183 2014/09/02 19:33:26 djm Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -405,7 +405,7 @@ struct winsize { | |||
405 | 405 | ||
406 | /* user may have set a different path */ | 406 | /* user may have set a different path */ |
407 | #if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) | 407 | #if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) |
408 | # undef _PATH_MAILDIR MAILDIR | 408 | # undef _PATH_MAILDIR |
409 | #endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */ | 409 | #endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */ |
410 | 410 | ||
411 | #ifdef MAIL_DIRECTORY | 411 | #ifdef MAIL_DIRECTORY |
@@ -603,10 +603,6 @@ struct winsize { | |||
603 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) | 603 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) |
604 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ | 604 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ |
605 | 605 | ||
606 | #if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) | ||
607 | # define USE_VHANGUP | ||
608 | #endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */ | ||
609 | |||
610 | #ifndef GETPGRP_VOID | 606 | #ifndef GETPGRP_VOID |
611 | # include <unistd.h> | 607 | # include <unistd.h> |
612 | # define getpgrp() getpgrp(0) | 608 | # define getpgrp() getpgrp(0) |
@@ -826,4 +822,23 @@ struct winsize { | |||
826 | # define arc4random_stir() | 822 | # define arc4random_stir() |
827 | #endif | 823 | #endif |
828 | 824 | ||
825 | #ifndef HAVE_VA_COPY | ||
826 | # ifdef HAVE___VA_COPY | ||
827 | # define va_copy(dest, src) __va_copy(dest, src) | ||
828 | # else | ||
829 | # define va_copy(dest, src) (dest) = (src) | ||
830 | # endif | ||
831 | #endif | ||
832 | |||
833 | #ifndef __predict_true | ||
834 | # if defined(__GNUC__) && \ | ||
835 | ((__GNUC__ > (2)) || (__GNUC__ == (2) && __GNUC_MINOR__ >= (96))) | ||
836 | # define __predict_true(exp) __builtin_expect(((exp) != 0), 1) | ||
837 | # define __predict_false(exp) __builtin_expect(((exp) != 0), 0) | ||
838 | # else | ||
839 | # define __predict_true(exp) ((exp) != 0) | ||
840 | # define __predict_false(exp) ((exp) != 0) | ||
841 | # endif /* gcc version */ | ||
842 | #endif /* __predict_true */ | ||
843 | |||
829 | #endif /* _DEFINES_H */ | 844 | #endif /* _DEFINES_H */ |