RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

compat: include proper headers for FreeBSD

Browse Source 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
This commit is contained in:
Yan, Zheng 2015-09-06 16:03:45 +08:00
parent be595df56c
commit b4330832cd
13 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph_fuse.cc
View File

@ -34,7 +34,7 @@ using namespace std;
#include "global/global_init.h"
#include "common/safe_io.h"
#ifndef DARWIN
#if !defined(DARWIN) && !defined(__FreeBSD__)
#include <envz.h>
#endif // DARWIN

2
src/client/fuse_ll.cc
View File

@ -14,6 +14,8 @@
#define FUSE_USE_VERSION 30
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>

1
src/common/ipaddr.cc
View File

@ -1,5 +1,6 @@
#include "include/ipaddr.h"
#include <sys/socket.h>
#include <arpa/inet.h>
#include <stdlib.h>
#include <string.h>

10
src/common/sync_filesystem.h
View File

@ -17,12 +17,10 @@
#include <unistd.h>
#ifndef __CYGWIN__
# ifndef DARWIN
# include <sys/ioctl.h>
# include <syscall.h>
# include "../os/btrfs_ioctl.h"
# endif
#if defined(__linux__)
#include <sys/ioctl.h>
#include <syscall.h>
#include "../os/btrfs_ioctl.h"
#endif
inline int sync_filesystem(int fd)

2
src/common/util.cc
View File

@ -25,7 +25,7 @@
#include <sys/vfs.h>
#endif
#if defined(DARWIN)
#if defined(DARWIN) || defined(__FreeBSD__)
#include <sys/param.h>
#include <sys/mount.h>
#endif

1
src/msg/async/EventKqueue.h
View File

@ -17,6 +17,7 @@
#ifndef CEPH_MSG_EVENTKQUEUE_H
#define CEPH_MSG_EVENTKQUEUE_H
#include <sys/types.h>
#include <sys/event.h>
#include <unistd.h>

2
src/msg/simple/Pipe.cc
View File

@ -12,7 +12,9 @@
*
*/
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <sys/uio.h>

4
src/os/GenericFileStoreBackend.cc
View File

@ -281,7 +281,7 @@ int GenericFileStoreBackend::do_fiemap(int fd, off_t start, size_t len, struct f
fiemap->fm_length = len + start % CEPH_PAGE_SIZE;
fiemap->fm_flags = FIEMAP_FLAG_SYNC; /* flush extents to disk if needed */
#if defined(DARWIN)
#if defined(DARWIN) || defined(__FreeBSD__)
ret = -ENOTSUP;
goto done_err;
#else
@ -305,7 +305,7 @@ int GenericFileStoreBackend::do_fiemap(int fd, off_t start, size_t len, struct f
fiemap->fm_extent_count = fiemap->fm_mapped_extents;
fiemap->fm_mapped_extents = 0;
#if defined(DARWIN)
#if defined(DARWIN) || defined(__FreeBSD__)
ret = -ENOTSUP;
goto done_err;
#else

2
src/os/chain_xattr.h
View File

@ -11,7 +11,7 @@
#if defined(__linux__)
#include <limits.h>
#define CHAIN_XATTR_MAX_NAME_LEN ((XATTR_NAME_MAX + 1) / 2)
#elif defined(__APPLE__) || defined(__FreeBSD__)
#elif defined(__APPLE__)
#include <sys/xattr.h>
#define CHAIN_XATTR_MAX_NAME_LEN ((XATTR_MAXNAMELEN + 1) / 2)
#else

2
src/os/fs/FS.cc
View File

@ -30,7 +30,7 @@
#include "XFS.h"
#endif
#ifdef DARWIN
#if defined(DARWIN) || defined(__FreeBSD__)
#include <sys/mount.h>
#else
#include <sys/vfs.h>

4
src/rbd_fuse/rbd-fuse.cc
View File

@ -19,6 +19,10 @@
#include <getopt.h>
#include <assert.h>
#if defined(__FreeBSD__)
#include <sys/param.h>
#endif
#include "include/compat.h"
#include "include/rbd/librbd.h"

2
src/rbd_replay/Deser.cc
View File

@ -15,7 +15,7 @@
#include "Deser.hpp"
#include <arpa/inet.h>
#include <cstdlib>
#if defined(DARWIN)
#if defined(DARWIN) || defined(__FreeBSD__)
#include <machine/endian.h>
#else
#include <endian.h>

2
src/rbd_replay/Ser.cc
View File

@ -16,7 +16,7 @@
#include "Ser.hpp"
#include <arpa/inet.h>
#include <cstdlib>
#if defined(DARWIN)
#if defined(DARWIN) || defined(__FreeBSD__)
#include <machine/endian.h>
#else
#include <endian.h>