fix mt-mapperd pithos read bug. plus some minor fixes

[archipelago] / xseg / xtypes / xpool.h

diff --git a/xseg/xtypes/xpool.h b/xseg/xtypes/xpool.h
index 84eccda..f2e0ce4 100644 (file)
--- a/xseg/xtypes/xpool.h
+++ b/xseg/xtypes/xpool.h
@@ -2,8 +2,7 @@
 #define XPOOL_H
 
 #include <sys/util.h>
-#include <xq/xq_lock.h>
-//#include <xseg/xseg.h>
+#include <xtypes/xlock.h>
 
 typedef uint64_t xpool_index;
 typedef uint64_t xpool_data;
@@ -19,7 +18,7 @@ struct xpool_node {
 };
 
 struct xpool {
-       struct xq_lock lock;
+       struct xlock lock;
        //XPTR_TYPE(struct xpool_node) list;
        //XPTR_TYPE(struct xpool_node) free;
        xpool_index list;