btrfs-progs: libbtrfs: remove unneeded BTRFS_FLAT_INCLUDES protections
Remove the switch for local and system-wide headers in headers that are not part of libbtrfs anymore. Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
5f1a09198f
commit
00610f5853
|
@ -19,16 +19,9 @@
|
|||
#ifndef __BTRFS_LIST_H__
|
||||
#define __BTRFS_LIST_H__
|
||||
|
||||
#if BTRFS_FLAT_INCLUDES
|
||||
#include "kerncompat.h"
|
||||
#include "kernel-lib/rbtree.h"
|
||||
#include "ioctl.h"
|
||||
#else
|
||||
#include <btrfs/kerncompat.h>
|
||||
#include <btrfs/rbtree.h>
|
||||
#include <btrfs/ioctl.h>
|
||||
#endif /* BTRFS_FLAT_INCLUDES */
|
||||
|
||||
#include <time.h>
|
||||
|
||||
enum btrfs_list_layout {
|
||||
|
|
|
@ -20,17 +20,10 @@
|
|||
#ifndef __BTRFS_CHECK_H__
|
||||
#define __BTRFS_CHECK_H__
|
||||
|
||||
#if BTRFS_FLAT_INCLUDES
|
||||
#include "kerncompat.h"
|
||||
#include "kernel-shared/ctree.h"
|
||||
#include "common/extent-cache.h"
|
||||
#include "kernel-lib/list.h"
|
||||
#else
|
||||
#include <btrfs/kerncompat.h>
|
||||
#include <btrfs/ctree.h>
|
||||
#include <btrfs/extent-cache.h>
|
||||
#include <btrfs/list.h>
|
||||
#endif /* BTRFS_FLAT_INCLUDES */
|
||||
|
||||
struct block_group_record {
|
||||
struct cache_extent cache;
|
||||
|
|
|
@ -21,12 +21,7 @@
|
|||
#include <limits.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <ioctl.h>
|
||||
|
||||
#if BTRFS_FLAT_INCLUDES
|
||||
#include "kernel-shared/ctree.h"
|
||||
#else
|
||||
#include <btrfs/ctree.h>
|
||||
#endif /* BTRFS_FLAT_INCLUDES */
|
||||
|
||||
/*
|
||||
* This function should be only used when parsing command arg, it won't return
|
||||
|
|
|
@ -19,11 +19,7 @@
|
|||
#ifndef __CRC32C__
|
||||
#define __CRC32C__
|
||||
|
||||
#if BTRFS_FLAT_INCLUDES
|
||||
#include "kerncompat.h"
|
||||
#else
|
||||
#include <btrfs/kerncompat.h>
|
||||
#endif /* BTRFS_FLAT_INCLUDES */
|
||||
|
||||
u32 crc32c_le(u32 seed, unsigned char const *data, size_t length);
|
||||
void crc32c_optimization_init(void);
|
||||
|
|
|
@ -37,11 +37,7 @@
|
|||
#ifndef _LINUX_RADIX_TREE_H
|
||||
#define _LINUX_RADIX_TREE_H
|
||||
|
||||
#if BTRFS_FLAT_INCLUDES
|
||||
#include "kerncompat.h"
|
||||
#else
|
||||
#include <btrfs/kerncompat.h>
|
||||
#endif /* BTRFS_FLAT_INCLUDES */
|
||||
|
||||
#define RADIX_TREE_MAX_TAGS 2
|
||||
|
||||
|
|
Loading…
Reference in New Issue