X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fcommon.h;h=d638fc93803c6ba12bb4b332471c445f08fe4eb9;hp=aea1f67d33b820fc3315452844f159e121e3ac7b;hb=269f52d6f8cd031692c83afaa05c389115d05bd0;hpb=4a7804bd08c790fc3c4233312e4b485c3302fe02

diff --git a/include/common.h b/include/common.h
index aea1f67..d638fc9 100644
--- a/include/common.h
+++ b/include/common.h
@@ -11,6 +11,9 @@
 #include <string.h>
 #include <sys/types.h>
 
+#define malloc "DON'T USE MALLOC" // use nbd_malloc() instead
+#define free   "DON'T USE FREE"   // use nbd_free() instead
+
 #define MAX_NUM_THREADS 4 // make this whatever you want, but make it a power of 2
 
 #define CACHE_LINE_SIZE 64
@@ -29,19 +32,19 @@
 #define SYNC_ADD           __sync_add_and_fetch
 #define SYNC_FETCH_AND_OR  __sync_fetch_and_or
 
-#define MASK(n)     ((1LL << (n)) - 1)
-
-#define TAG          (1LL << 63)
-#define IS_TAGGED(v) ((int64_t)(v) < 0)
-#define TAG_VALUE(v) ((int64_t)(v) |  TAG)
-#define STRIP_TAG(v) ((int64_t)(v) & ~TAG)
+#define MASK(n)     ((1ULL << (n)) - 1)
 
 #define TRUE  1
 #define FALSE 0
 
-typedef          long long  int64_t;
+#define TAG          (1ULL << 63)
+#define TAG_VALUE(v) ((uint64_t)(v) |  TAG)
+#define IS_TAGGED(v) ((uint64_t)(v) &  TAG)
+#define STRIP_TAG(v) ((uint64_t)(v) & ~TAG)
+
 typedef unsigned long long uint64_t;
 typedef unsigned int       uint32_t;
+typedef unsigned char      uint8_t;
 
 #include "lwt.h"
 #endif //COMMON_H