summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-16 16:11:02 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-16 16:11:02 +1000
commit3278062bf3e2e435163998feca90c13e80d53d5d (patch)
tree3523195ab90b296be25e532223d218680363a201 /defines.h
parenta422d9756e3fbe932db063592b5303aae7cc0b28 (diff)
downloadopenssh-git-3278062bf3e2e435163998feca90c13e80d53d5d.tar.gz
- (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.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/defines.h b/defines.h
index 457b6a35..2ccded26 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.154 2009/03/07 01:32:22 dtucker Exp $ */
+/* $Id: defines.h,v 1.155 2009/06/16 06:11:02 dtucker Exp $ */
/* Constants */
@@ -594,6 +594,10 @@ struct winsize {
#define FSID_TO_ULONG(f) \
((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \
((f).val[1] & 0xffffffffUL))
+#elif defined(FSID_HAS___VAL)
+#define FSID_TO_ULONG(f) \
+ ((((u_int64_t)(f).__val[0] & 0xffffffffUL) << 32) | \
+ ((f).__val[1] & 0xffffffffUL))
#else
# define FSID_TO_ULONG(f) ((f))
#endif