Attachment 1649 Details for Bug 1607 – Handle f_fsid.__val too

[patch] Handle f_fsid.__val too

openssh-fsid.__val.patch (text/plain), 1.62 KB, created by Darren Tucker on 2009-06-12 14:28:35 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2009-06-12 14:28:35 AEST

Size: 1.62 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/configure.ac,v
>retrieving revision 1.419
>diff -u -p -r1.419 configure.ac
>--- configure.ac	18 Mar 2009 18:25:02 -0000	1.419
>+++ configure.ac	11 Jun 2009 23:06:09 -0000
>@@ -3080,13 +3080,23 @@ if test "x$ac_cv_have_accrights_in_msghd
> 		file descriptor passing])
> fi
> 
>-AC_MSG_CHECKING(if f_fsid has val members)
>+AC_MSG_CHECKING(if f_fsid has member val)
> AC_TRY_COMPILE([
> #include <sys/types.h>
> #include <sys/statvfs.h>],
> [struct fsid_t t; t.val[0] = 0;],
> 	[ AC_MSG_RESULT(yes)
>-	  AC_DEFINE(FSID_HAS_VAL, 1, f_fsid has members) ],
>+	  AC_DEFINE(FSID_HAS_VAL, 1, f_fsid has member val) ],
>+	[ AC_MSG_RESULT(no) ]
>+)
>+
>+AC_MSG_CHECKING(if f_fsid has member __val)
>+AC_TRY_COMPILE([
>+#include <sys/types.h>
>+#include <sys/statvfs.h>],
>+[struct fsid_t t; t.__val[0] = 0;],
>+	[ AC_MSG_RESULT(yes)
>+	  AC_DEFINE(FSID_HAS___VAL, 1, f_fsid has member __val) ],
> 	[ AC_MSG_RESULT(no) ]
> )
> 
>Index: defines.h
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/defines.h,v
>retrieving revision 1.154
>diff -u -p -r1.154 defines.h
>--- defines.h	7 Mar 2009 01:32:22 -0000	1.154
>+++ defines.h	11 Jun 2009 23:07:12 -0000
>@@ -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

Actions: View | Diff

Attachments on bug 1607: 1649 | 1650