From 3d138b3e8fe85fbd7f33db3f90e2f1064a26bab5 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Wed, 30 Aug 2017 00:12:11 +0300 Subject: [PATCH] cleanup NetBSD/OpenBSD header * NetBSD's was renamed to 7 years ago. * Drop unneeded undefs. Signed-off-by: Tomohiro Kusumi Signed-off-by: Jens Axboe --- os/os-netbsd.h | 6 ++---- os/os-openbsd.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/os/os-netbsd.h b/os/os-netbsd.h index eac76cf2..682a11c9 100644 --- a/os/os-netbsd.h +++ b/os/os-netbsd.h @@ -11,9 +11,9 @@ #include #include #include -/* XXX hack to avoid confilcts between rbtree.h and */ -#define rb_node _rb_node #include + +/* XXX hack to avoid confilcts between rbtree.h and */ #undef rb_node #undef rb_left #undef rb_right @@ -26,8 +26,6 @@ #define FIO_HAVE_FS_STAT #define FIO_HAVE_GETTID -#undef FIO_HAVE_CPU_AFFINITY /* doesn't exist */ - #define OS_MAP_ANON MAP_ANON #ifndef PTHREAD_STACK_MIN diff --git a/os/os-openbsd.h b/os/os-openbsd.h index 675bf892..b4c02c9b 100644 --- a/os/os-openbsd.h +++ b/os/os-openbsd.h @@ -11,23 +11,21 @@ #include #include #include -/* XXX hack to avoid conflicts between rbtree.h and */ #include + +/* XXX hack to avoid conflicts between rbtree.h and */ #undef RB_BLACK #undef RB_RED #undef RB_ROOT #include "../file.h" -#undef FIO_HAVE_ODIRECT #define FIO_USE_GENERIC_RAND #define FIO_USE_GENERIC_INIT_RANDOM_STATE #define FIO_HAVE_FS_STAT #define FIO_HAVE_GETTID #define FIO_HAVE_SHM_ATTACH_REMOVED -#undef FIO_HAVE_CPU_AFFINITY /* doesn't exist */ - #define OS_MAP_ANON MAP_ANON #ifndef PTHREAD_STACK_MIN -- 2.25.1