--- libaitsess/inc/defs.h 2012/02/27 17:43:33 1.4.2.1 +++ libaitsess/inc/defs.h 2012/02/28 12:58:10 1.4.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: defs.h,v 1.4.2.1 2012/02/27 17:43:33 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 @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -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,16 +63,17 @@ 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) -#define MEM_CORRUPT(x) (!(x) || ((unsigned int*)(x))[-1] != MEM_MAGIC_START || \ - ((unsigned int*)(x))[((unsigned int*)(x))[-2]] != MEM_MAGIC_STOP) +#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(unsigned int)) +#define mem_size(x) (mem_len((x)) * sizeof(u_int)) #define LOGERR { \