View | Details | Raw Unified | Return to bug 1607 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-2 / +12 lines)
Lines 3080-3092 if test "x$ac_cv_have_accrights_in_msghd Link Here
3080
		file descriptor passing])
3080
		file descriptor passing])
3081
fi
3081
fi
3082
3082
3083
AC_MSG_CHECKING(if f_fsid has val members)
3083
AC_MSG_CHECKING(if f_fsid has member val)
3084
AC_TRY_COMPILE([
3084
AC_TRY_COMPILE([
3085
#include <sys/types.h>
3085
#include <sys/types.h>
3086
#include <sys/statvfs.h>],
3086
#include <sys/statvfs.h>],
3087
[struct fsid_t t; t.val[0] = 0;],
3087
[struct fsid_t t; t.val[0] = 0;],
3088
	[ AC_MSG_RESULT(yes)
3088
	[ AC_MSG_RESULT(yes)
3089
	  AC_DEFINE(FSID_HAS_VAL, 1, f_fsid has members) ],
3089
	  AC_DEFINE(FSID_HAS_VAL, 1, f_fsid has member val) ],
3090
	[ AC_MSG_RESULT(no) ]
3091
)
3092
3093
AC_MSG_CHECKING(if f_fsid has member __val)
3094
AC_TRY_COMPILE([
3095
#include <sys/types.h>
3096
#include <sys/statvfs.h>],
3097
[struct fsid_t t; t.__val[0] = 0;],
3098
	[ AC_MSG_RESULT(yes)
3099
	  AC_DEFINE(FSID_HAS___VAL, 1, f_fsid has member __val) ],
3090
	[ AC_MSG_RESULT(no) ]
3100
	[ AC_MSG_RESULT(no) ]
3091
)
3101
)
3092
3102
(-)defines.h (+4 lines)
Lines 594-599 struct winsize { Link Here
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

Return to bug 1607