Index: trunk/xcache/xc_shm.h
===================================================================
--- trunk/xcache/xc_shm.h	(revision 1040)
+++ trunk/xcache/xc_shm.h	(revision 1135)
@@ -1,4 +1,7 @@
 #ifndef XC_SHM_H
 #define XC_SHM_H
+
+#include <stdlib.h>
+
 typedef struct _xc_shm_handlers_t xc_shm_handlers_t;
 
@@ -13,6 +16,4 @@
 typedef size_t xc_shmsize_t;
 
-#include "xc_mem.h"
-
 /* shm */
 #define XC_SHM_CAN_READONLY(func) int   func(xc_shm_t *shm)
@@ -25,10 +26,9 @@
 #define XC_SHM_DESTROY(func)      void func(xc_shm_t *shm)
 
-#define XC_SHM_MEMINIT(func)      xc_mem_t *func(xc_shm_t *shm, xc_memsize_t size)
-#define XC_SHM_MEMDESTROY(func)   void func(xc_mem_t *mem)
+#define XC_SHM_MEMINIT(func)      void *func(xc_shm_t *shm, xc_shmsize_t size)
+#define XC_SHM_MEMDESTROY(func)   void func(void *mem)
 
 #define XC_SHM_HANDLERS(name)    { \
-	NULL                           \
-	, xc_##name##_can_readonly     \
+	xc_##name##_can_readonly       \
 	, xc_##name##_is_readwrite     \
 	, xc_##name##_is_readonly      \
@@ -44,5 +44,4 @@
 
 struct _xc_shm_handlers_t {
-	const xc_mem_handlers_t *memhandlers;
 	XC_SHM_CAN_READONLY((*can_readonly));
 	XC_SHM_IS_READWRITE((*is_readwrite));