--- libelwix/inc/elwix.h	2013/01/18 10:12:22	1.1.1.1.2.4
+++ libelwix/inc/elwix.h	2013/07/07 21:05:58	1.7.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.1.1.1.2.4 2013/01/18 10:12:22 misho Exp $
+* $Id: elwix.h,v 1.7.2.1 2013/07/07 21:05:58 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -50,7 +50,10 @@ SUCH DAMAGE.
 #include <assert.h>
 #include <syslog.h>
 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/limits.h>
 #include <sys/socket.h>
+#include <sys/endian.h>
 #include <sys/un.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
@@ -64,14 +67,20 @@ SUCH DAMAGE.
 #include <elwix/avar.h>
 #include <elwix/astr.h>
 #include <elwix/aregex.h>
-#include <elwix/av.h>
+#include <elwix/aav.h>
 #include <elwix/anet.h>
+#include <elwix/atime.h>
+#include <elwix/apack.h>
 
 
 #ifndef STRSIZ
 #define STRSIZ		256
 #endif
 
+#ifndef NBBY
+#define	NBBY		8		/* number of bits in a byte */
+#endif
+
 #ifndef be16toh
 #define be16toh		betoh16
 #endif
@@ -91,29 +100,74 @@ SUCH DAMAGE.
 #define le64toh		letoh64
 #endif
 
-#define E_ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
+/* Bit map related macros. */
+#ifndef setbit
+#define	setbit(a, i)		(((unsigned char *)(a))[(i) / NBBY] |= 1 << ((i) % NBBY))
+#endif
+#ifndef clrbit
+#define	clrbit(a, i)		(((unsigned char *)(a))[(i) / NBBY] &= ~(1 << ((i) % NBBY)))
+#endif
+#ifndef isset
+#define	isset(a, i)		(((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY)))
+#endif
+#ifndef isclr
+#define	isclr(a, i)		((((const unsigned char *)(a))[(i) / NBBY] & (1 << ((i) % NBBY))) == 0)
+#endif
 
+/* Macros for counting and rounding. */
+#ifndef howmany
+#define	howmany(x, y)		(((x) + ((y) - 1)) / (y))
+#endif
+#ifndef nitems
+#define	nitems(x)		(sizeof((x)) / sizeof((x)[0]))
+#endif
+#ifndef rounddown
+#define	rounddown(x, y)		(((x) / (y)) * (y))
+#endif
+#ifndef rounddown2
+#define	rounddown2(x, y)	((x) & (~((y) - 1))) /* if y is power of two */
+#endif
+#ifndef roundup
+#define	roundup(x, y)		((((x) + ((y) - 1)) / (y)) * (y)) /* to any y */
+#endif
+#ifndef roundup2
+#define	roundup2(x, y)		(((x) + ((y) - 1)) & (~((y) - 1))) /* if y is powers of two */
+#endif
+#ifndef powerof2
+#define powerof2(x)		((((x) - 1) & (x)) == 0)
+#endif
 
-#define ELWIX_SYSM	0
-#define ELWIX_MPOOL	1
+/* Macros for min/max. */
+#ifndef MIN
+#define	MIN(a, b)		(((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+#define	MAX(a, b)		(((a) > (b)) ? (a) : (b))
+#endif
 
-#define VACUUM_LEFT	1
-#define VACUUM_BETWEEN	2
+#define E_ALIGN(x, a)		(((x) + ((a) - 1)) & ~((a) - 1))
 
 
+#define ELWIX_SYSM		0
+#define ELWIX_MPOOL		1
+
+#define VACUUM_LEFT		1
+#define VACUUM_BETWEEN		2
+
+
 // elwix_SetProg() Set program memory pool name
-inline void elwix_SetProg(const char *csProgName);
+void elwix_SetProg(const char *csProgName);
 // elwix_GetProg() Get program memory pool name
-inline const char *elwix_GetProg();
+const char *elwix_GetProg();
 
 // elwix_GetErrno() Get error code of last operation
-inline int elwix_GetErrno();
+int elwix_GetErrno();
 // elwix_GetError() Get error text of last operation
-inline const char *elwix_GetError();
+const char *elwix_GetError();
 
 
 // elwix_mm_inuse() Check for memory management model
-inline int elwix_mm_inuse();
+int elwix_mm_inuse();
 
 
 /*
@@ -123,13 +177,13 @@ inline int elwix_mm_inuse();
  * @maxmem = memory limit
  * return: -1 error or !=-1 used memory management model
  */
-inline int elwixInit(int mm, unsigned long maxmem);
+int elwixInit(int mm, unsigned long maxmem);
 /*
  * elwixFini() - Finish libelwix library memory management
  *
  * return: none
  */
-inline void elwixFini();
+void elwixFini();
 
 /* memory management hooks */
 extern void *(*e_malloc)(size_t);
@@ -164,8 +218,8 @@ extern int elwix_Debug;
 #define ELWIX_DEBUG_LOG		0x2
 #define ELWIX_DEBUG_ANY		0xFFFFFFFF
 
-#define ETRACE(x)		if (elwix_Debug & ELWIX_DEBUG_TRACE) \
-					   syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__)
+#define ETRACE()		if (elwix_Debug & ELWIX_DEBUG_TRACE) \
+					   syslog(LOG_DEBUG, "I'm in %s(%d)\n", __func__, __LINE__)
 #define EDEBUG(x, fmt, ...)	do { assert((fmt)); \
 					if ((x) & elwix_Debug) { \
 						char str[BUFSIZ] = { 0 }; \