* 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>
#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
+
+/* 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
#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
#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> */
+
+/* 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"
#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