diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /defines.h | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) |
merge 5.5p1
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 4 |
1 files changed, 2 insertions, 2 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.159 2010/01/13 23:44:34 tim Exp $ */ | 28 | /* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -674,7 +674,7 @@ struct winsize { | |||
674 | #else | 674 | #else |
675 | /* Simply select your favourite login types. */ | 675 | /* Simply select your favourite login types. */ |
676 | /* Can't do if-else because some systems use several... <sigh> */ | 676 | /* Can't do if-else because some systems use several... <sigh> */ |
677 | # if defined(UTMPX_FILE) && !defined(DISABLE_UTMPX) | 677 | # if !defined(DISABLE_UTMPX) |
678 | # define USE_UTMPX | 678 | # define USE_UTMPX |
679 | # endif | 679 | # endif |
680 | # if defined(UTMP_FILE) && !defined(DISABLE_UTMP) | 680 | # if defined(UTMP_FILE) && !defined(DISABLE_UTMP) |