From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 5 Jun 2016 06:01:23 +0000 (+0800)
Subject: Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2
X-Git-Tag: v11.0.0~319
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abe240b57ec0063fc508e9aa7e7e27b71e162fe7;p=ceph.git

Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2

build: freebsd changes (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

abe240b57ec0063fc508e9aa7e7e27b71e162fe7
diff --cc src/test/encoding/types.h
index dd10093fb1cc,860cc87391cb..cf11b85184b2
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@@ -114,9 -114,9 +114,10 @@@ TYPE(ObjectStore::Transaction
  #include "os/filestore/SequencerPosition.h"
  TYPE(SequencerPosition)
  
+ #if !defined(__FreeBSD__)
  #include "os/bluestore/bluestore_types.h"
  TYPE(bluestore_cnode_t)
 +TYPE(bluestore_compression_header_t)
  TYPE(bluestore_extent_t)
  TYPE(bluestore_extent_ref_map_t)
  TYPE(bluestore_overlay_t)