diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/argp-standalone/configure.ac | 2 | ||||
| -rw-r--r-- | contrib/fuse-lib/mount.c | 10 | ||||
| -rw-r--r-- | contrib/libexecinfo/execinfo_compat.h | 6 | ||||
| -rw-r--r-- | contrib/qemu/include/sysemu/os-posix.h | 2 | ||||
| -rw-r--r-- | contrib/qemu/util/oslib-posix.c | 1 |
5 files changed, 12 insertions, 9 deletions
diff --git a/contrib/argp-standalone/configure.ac b/contrib/argp-standalone/configure.ac index 98bedc6f39f..c0867eb5b35 100644 --- a/contrib/argp-standalone/configure.ac +++ b/contrib/argp-standalone/configure.ac @@ -100,6 +100,6 @@ fi CPPFLAGS="$CPPFLAGS -I$srcdir" dnl Added for C99 standards -CFLAGS="$CFLAGS -std=gnu89" +CFLAGS="$CFLAGS -std=gnu89 -static" AC_OUTPUT(Makefile) diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c index a7fd94de464..1edde86014a 100644 --- a/contrib/fuse-lib/mount.c +++ b/contrib/fuse-lib/mount.c @@ -246,14 +246,16 @@ fuse_mount_sys (const char *mountpoint, char *fsname, #ifdef __FreeBSD__ struct iovec *iov = NULL; int iovlen = 0; + char fdstr[15]; + sprintf (fdstr, "%d", fd); + build_iovec (&iov, &iovlen, "fstype", "fusefs", -1); build_iovec (&iov, &iovlen, "subtype", "glusterfs", -1); - build_iovec (&iov, &iovlen, "fspath", mountpoint, -1); + build_iovec (&iov, &iovlen, "fspath", __DECONST(void *, mountpoint), + -1); build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1); build_iovec (&iov, &iovlen, "volname", source, -1); - build_iovec_argf (&iov, &iovlen, "fd", "%d", fd); - build_iovec_argf (&iov, &iovlen, "user_id", "%d", getuid()); - build_iovec_argf (&iov, &iovlen, "group_id", "%d", getgid()); + build_iovec (&iov, &iovlen, "fd", fdstr, -1); ret = nmount (iov, iovlen, mountflags); #else ret = mount (source, mountpoint, fstype, mountflags, diff --git a/contrib/libexecinfo/execinfo_compat.h b/contrib/libexecinfo/execinfo_compat.h index 85f185dd5f7..ae84cfb1f35 100644 --- a/contrib/libexecinfo/execinfo_compat.h +++ b/contrib/libexecinfo/execinfo_compat.h @@ -39,9 +39,9 @@ extern "C" { #endif -int backtrace(void **, int); -char **backtrace_symbols(void *const *, int); -void backtrace_symbols_fd(void *const *, int, int); +extern int backtrace(void **, int); +extern char **backtrace_symbols(void *const *, int); +extern void backtrace_symbols_fd(void *const *, int, int); #ifdef __cplusplus } diff --git a/contrib/qemu/include/sysemu/os-posix.h b/contrib/qemu/include/sysemu/os-posix.h index 25d0b2a73f6..ed8cbaff6a3 100644 --- a/contrib/qemu/include/sysemu/os-posix.h +++ b/contrib/qemu/include/sysemu/os-posix.h @@ -36,7 +36,7 @@ int os_mlock(void); typedef struct timeval qemu_timeval; #define qemu_gettimeofday(tp) gettimeofday(tp, NULL) -#ifndef CONFIG_UTIMENSAT +#if !defined(CONFIG_UTIMENSAT) || defined(__FreeBSD__) #ifndef UTIME_NOW # define UTIME_NOW ((1l << 30) - 1l) #endif diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c index 5dceea5f581..77cb9b72d1d 100644 --- a/contrib/qemu/util/oslib-posix.c +++ b/contrib/qemu/util/oslib-posix.c @@ -50,6 +50,7 @@ extern int daemon(int, int); #include <glib/gprintf.h> #include "config-host.h" +#include "qemu-common.h" #include "sysemu/sysemu.h" #include "trace.h" #include "qemu/sockets.h" |