cleanup NetBSD/OpenBSD header

* NetBSD's <sys/rb.h> was renamed to <sys/rbtree.h> 7 years ago.
* Drop unneeded undefs.

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index eac76cf26bb2ea9247ecaf394468b4987e831585..682a11c95f1ccb91df421e424923dbd2c9703761 100644 (file)
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -11,9 +11,9 @@
 #include <sys/dkio.h>
 #include <sys/disklabel.h>
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disklabel.h>
 #include <sys/endian.h>

-/* XXX hack to avoid confilcts between rbtree.h and <sys/rb.h> */
-#define        rb_node _rb_node

 #include <sys/sysctl.h>
 #include <sys/sysctl.h>

+
+/* XXX hack to avoid confilcts between rbtree.h and <sys/rbtree.h> */

 #undef rb_node
 #undef rb_left
 #undef rb_right
 #undef rb_node
 #undef rb_left
 #undef rb_right


@@ -26,8 +26,6 @@
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 
 #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
 #define OS_MAP_ANON            MAP_ANON
 
 #ifndef PTHREAD_STACK_MIN

diff --git a/os/os-openbsd.h b/os/os-openbsd.h
index 675bf892d78ab556d178c8dff51e482e8b4267ed..b4c02c9bf236803227cdb053f35975bb2b6f26d6 100644 (file)
--- a/os/os-openbsd.h
+++ b/os/os-openbsd.h
@@ -11,23 +11,21 @@
 #include <sys/disklabel.h>
 #include <sys/endian.h>
 #include <sys/utsname.h>
 #include <sys/disklabel.h>
 #include <sys/endian.h>
 #include <sys/utsname.h>

-/* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */

 #include <sys/sysctl.h>
 #include <sys/sysctl.h>

+
+/* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */

 #undef RB_BLACK
 #undef RB_RED
 #undef RB_ROOT
 
 #include "../file.h"
 
 #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
 
 #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
 #define OS_MAP_ANON            MAP_ANON
 
 #ifndef PTHREAD_STACK_MIN