]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2
authorKefu Chai <tchaikov@gmail.com>
Sun, 5 Jun 2016 06:01:23 +0000 (14:01 +0800)
committerKefu Chai <tchaikov@gmail.com>
Sun, 5 Jun 2016 06:01:23 +0000 (14:01 +0800)
build: freebsd changes (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/global/signal_handler.cc
src/include/rados/librados.h
src/os/filestore/FileStore.cc
src/test/encoding/types.h

Simple merge
Simple merge
Simple merge
index dd10093fb1cc92cfeb5363cfacc138751b5b7a89,860cc87391cb046af59a846e07a4c607706a3cb9..cf11b85184b259d39a009d77cfd07337b74ab9e2
@@@ -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)