# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1191969884 18000
# Node ID be015f9b740521efa67d72fb0f798188a9f37a73
# Parent  f9c2917a9f7a4b5f59e78e289fdc00445e6b0961# Parent  0d154bce23419132d246b2b20b234216a47f48d8
Merge with crew

diff --git a/mercurial/osutil.c b/mercurial/osutil.c
--- a/mercurial/osutil.c
+++ b/mercurial/osutil.c
@@ -17,6 +17,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#if defined(__sun)
+#define dirfd(dir) ((dir)->dd_fd)
+#endif
+
 struct listdir_stat {
 	PyObject_HEAD
 	struct stat st;