blob: 67871225cec6775ec6d27879c2988af1433fb688 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-ac,v 1.4 2012/05/30 13:52:19 obache Exp $
* http://bugzilla.gnome.org/show_bug.cgi?id=583927
* directly includion of glib/gurifuncs.h is not allowed by GLib>=2.30
--- client/gvfsfusedaemon.c.orig 2010-11-12 15:42:49.000000000 +0000
+++ client/gvfsfusedaemon.c
@@ -26,7 +26,9 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#if !defined(__NetBSD__)
#include <sys/vfs.h>
+#endif
#include <sys/time.h>
#include <unistd.h>
#include <stdlib.h>
@@ -41,8 +43,6 @@
#include <glib/gprintf.h>
#include <gio/gio.h>
-#include <glib/gurifuncs.h>
-
/* stuff from common/ */
#include <gdaemonmount.h>
#include <gvfsdaemonprotocol.h>
@@ -2340,7 +2340,9 @@ vfs_init (struct fuse_conn_info *conn)
subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
/* Indicate O_TRUNC support for open() */
+#ifdef FUSE_CAP_ATOMIC_O_TRUNC
conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
+#endif
return NULL;
}
|
