--- libaitsess/inc/defs.h	2012/02/28 13:00:24	1.5
+++ libaitsess/inc/defs.h	2012/07/22 22:13:48	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.5 2012/02/28 13:00:24 misho Exp $
+* $Id: defs.h,v 1.6 2012/07/22 22:13:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,35 +46,15 @@ SUCH DAMAGE.
 #ifndef __DEFS_H
 #define __DEFS_H
 
+
+#ifndef STRSIZ
 #define STRSIZ		256
+#endif
 
 #define SESS_AIT_MAGIC	0x3CC3
 
 #define MEM_MODE	0640
 #define MEM_DELIM	"\xFF"
-
-#define MEM_MAGIC_START	0xAAAAAAAA
-#define MEM_MAGIC_STOP	0x55555555
-#define MEM_ALLOC_MAX	0xFFFFFFF3
-
-/* memory pool helper macros */
-
-#define MEM_MIN_BUCKET	4
-#define MEM_MAX_BUCKET	32
-
-#define MEM_PTR2LINT(x)	((u_int) ((uintptr_t)(x)) & 0xFFFFFFFF)
-#define MEM_PTR2HINT(x)	((u_int) (sizeof(uintptr_t) == sizeof(u_int)) ? 0 : \
-				(((uintptr_t)(x)) >> 32) & 0xFFFFFFFF)
-#define MEM_INT2PTR(x)	((void*) ((uintptr_t)(x)))
-
-#define MEM_BADADDR(x)	(MEM_PTR2LINT(x) < 0x00001000U || MEM_PTR2LINT(x) > 0xFFFFF000U)
-#define MEM_CORRUPT(x)	(!(x) || ((u_int*)(x))[-1] != MEM_MAGIC_START || \
-				((u_int*)(x))[((u_int*)(x))[-2]] != MEM_MAGIC_STOP)
-
-#define mem_data(x, _type)	(assert((x)), (_type) ((x)->alloc_mem ? ((x)->alloc_mem + 2) : NULL))
-#define mem_len(x)		(assert((x)), (x)->alloc_mem ? *(x)->alloc_mem : 0)
-#define mem_size(x)		(mem_len((x)) * sizeof(u_int))
-
 
 #define LOGERR	{ \
 			sess_Errno = errno; \