- (dtucker) [configure.ac defines.h sftp-client.c M sftp-server.c] Add a

   macro to convert fsid to unsigned long for platforms where fsid is a
   2-member array.

1 files changed, 10 insertions, 1 deletions

diff --git a/defines.h b/defines.h
index 7bb3a55e8..0665d2b51 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.148 2008/06/08 17:32:29 dtucker Exp $ */
+/* $Id: defines.h,v 1.149 2008/06/08 20:17:53 dtucker Exp $ */
 
 
 /* Constants */
@@ -590,6 +590,15 @@ struct winsize {
 # define SSH_SYSFDMAX 10000
 #endif
 
+#ifdef FSID_HAS_VAL
+/* encode f_fsid into a 64 bit value  */
+#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
+
 #if defined(__Lynx__)
  /*
   * LynxOS defines these in param.h which we do not want to include since