diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-06-16 16:11:02 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-06-16 16:11:02 +1000 |
commit | 3278062bf3e2e435163998feca90c13e80d53d5d (patch) | |
tree | 3523195ab90b296be25e532223d218680363a201 /defines.h | |
parent | a422d9756e3fbe932db063592b5303aae7cc0b28 (diff) |
- (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
is a struct with a __val member. Fixes build on, eg, Redhat 6.2.
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 6 |
1 files changed, 5 insertions, 1 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.154 2009/03/07 01:32:22 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.155 2009/06/16 06:11:02 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -594,6 +594,10 @@ struct winsize { | |||
594 | #define FSID_TO_ULONG(f) \ | 594 | #define FSID_TO_ULONG(f) \ |
595 | ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ | 595 | ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ |
596 | ((f).val[1] & 0xffffffffUL)) | 596 | ((f).val[1] & 0xffffffffUL)) |
597 | #elif defined(FSID_HAS___VAL) | ||
598 | #define FSID_TO_ULONG(f) \ | ||
599 | ((((u_int64_t)(f).__val[0] & 0xffffffffUL) << 32) | \ | ||
600 | ((f).__val[1] & 0xffffffffUL)) | ||
597 | #else | 601 | #else |
598 | # define FSID_TO_ULONG(f) ((f)) | 602 | # define FSID_TO_ULONG(f) ((f)) |
599 | #endif | 603 | #endif |