From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sun, 18 Oct 2015 10:15:10 +0000 (+0200)
Subject: Merge pull request #1595 from poettering/proxy-fixes
X-Git-Tag: v228~190
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=606601ddcac15f5ade4f6840fd04d6f26acce2f4;hp=-c

Merge pull request #1595 from poettering/proxy-fixes

bus proxy fixes, and more
---

606601ddcac15f5ade4f6840fd04d6f26acce2f4
diff --combined src/basic/missing.h
index 5fb9951a848,8d11b80d95d..70d6c8308ee
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@@ -126,10 -126,6 +126,10 @@@
  #define SOL_NETLINK 270
  #endif
  
 +#ifndef NETLINK_LIST_MEMBERSHIPS
 +#define NETLINK_LIST_MEMBERSHIPS 9
 +#endif
 +
  #if !HAVE_DECL_PIVOT_ROOT
  static inline int pivot_root(const char *new_root, const char *put_old) {
          return syscall(SYS_pivot_root, new_root, put_old);
@@@ -252,6 -248,10 +252,10 @@@ static inline int getrandom(void *buffe
  #define BTRFS_SEARCH_ARGS_BUFSIZE (4096 - sizeof(struct btrfs_ioctl_search_key))
  #endif
  
+ #ifndef BTRFS_QGROUP_LEVEL_SHIFT
+ #define BTRFS_QGROUP_LEVEL_SHIFT 48
+ #endif
+ 
  #ifndef HAVE_LINUX_BTRFS_H
  struct btrfs_ioctl_vol_args {
          int64_t fd;