--- libaitsess/inc/defs.h	2012/02/27 23:57:12	1.4.2.2
+++ libaitsess/inc/defs.h	2012/02/28 12:58:10	1.4.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.4.2.2 2012/02/27 23:57:12 misho Exp $
+* $Id: defs.h,v 1.4.2.4 2012/02/28 12:58:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -53,10 +53,6 @@ SUCH DAMAGE.
 #define MEM_MODE	0640
 #define MEM_DELIM	"\xFF"
 
-#define MEM_FLAG_ACT	0
-#define MEM_FLAG_INACT	1
-#define MEM_FLAG_LOCK	2
-
 #define MEM_MAGIC_START	0xAAAAAAAA
 #define MEM_MAGIC_STOP	0x55555555
 #define MEM_ALLOC_MAX	0xFFFFFFF3
@@ -67,7 +63,8 @@ SUCH DAMAGE.
 #define MEM_MAX_BUCKET	32
 
 #define MEM_PTR2LINT(x)	((u_int) ((uintptr_t)(x)) & 0xFFFFFFFF)
-#define MEM_PTR2HINT(x)	((u_int) (((uintptr_t)(x)) >> 32) & 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)