diff options
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 17 |
1 files changed, 7 insertions, 10 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.166 2011/05/05 06:06:59 tim Exp $ */ | 28 | /* $Id: defines.h,v 1.167 2011/06/03 01:17:49 tim Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -389,18 +389,15 @@ struct winsize { | |||
389 | # define _PATH_DEVNULL "/dev/null" | 389 | # define _PATH_DEVNULL "/dev/null" |
390 | #endif | 390 | #endif |
391 | 391 | ||
392 | #ifndef MAIL_DIRECTORY | 392 | /* user may have set a different path */ |
393 | # define MAIL_DIRECTORY "/var/spool/mail" | 393 | #if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) |
394 | #endif | 394 | # undef _PATH_MAILDIR MAILDIR |
395 | #endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */ | ||
395 | 396 | ||
396 | #ifndef MAILDIR | 397 | #ifdef MAIL_DIRECTORY |
397 | # define MAILDIR MAIL_DIRECTORY | 398 | # define _PATH_MAILDIR MAIL_DIRECTORY |
398 | #endif | 399 | #endif |
399 | 400 | ||
400 | #if !defined(_PATH_MAILDIR) && defined(MAILDIR) | ||
401 | # define _PATH_MAILDIR MAILDIR | ||
402 | #endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */ | ||
403 | |||
404 | #ifndef _PATH_NOLOGIN | 401 | #ifndef _PATH_NOLOGIN |
405 | # define _PATH_NOLOGIN "/etc/nologin" | 402 | # define _PATH_NOLOGIN "/etc/nologin" |
406 | #endif | 403 | #endif |