Merge branch 'req4' of git://github.com/kusumi/fio

diff --git a/os/os-dragonfly.h b/os/os-dragonfly.h
index cc3de31e5a0811334bb6f296698896c6c56ebf9f..bc855baf1cab993e8049ea21e66c7e6082743d6b 100644 (file)
--- a/os/os-dragonfly.h
+++ b/os/os-dragonfly.h
@@ -5,12 +5,7 @@
 
 #include <errno.h>
 #include <sys/param.h>
-/* XXX hack to avoid confilcts between rbtree.h and <sys/rb.h> */
-#define        rb_node _rb_node
 #include <sys/sysctl.h>
-#undef rb_node
-#undef rb_left
-#undef rb_right
 
 #include "../file.h"