--- libelwix/inc/elwix.h	2019/08/19 16:01:47	1.16.32.1
+++ libelwix/inc/elwix.h	2022/10/23 23:46:01	1.20.12.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.16.32.1 2019/08/19 16:01:47 misho Exp $
+* $Id: elwix.h,v 1.20.12.2 2022/10/23 23:46:01 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 <info@elwix.org>
 
-Copyright 2004 - 2019
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,8 @@ SUCH DAMAGE.
 #include <elwix/apack.h>
 #include <elwix/apio.h>
 #include <elwix/ajson.h>
+#include <elwix/aiov.h>
+#include <elwix/aindex.h>
 
 
 #ifndef STRSIZ
@@ -248,6 +250,7 @@ extern void (*e_free)(void*);
 
 /* Verbose macros */
 extern int elwix_Verbose;
+#define e_Verbose		elwix_Verbose
 #define e_initVerbose(x)	(elwix_Verbose = (x))
 #define e_incVerbose		(elwix_Verbose++)
 #define e_decVerbose		(elwix_Verbose--)
@@ -261,6 +264,14 @@ extern int elwix_Verbose;
 								(x), __func__, __LINE__, __str); \
 					} \
 				} while (0)
+#define EVERBOSE2(x, fmt, ...)	do { assert((fmt)); \
+					if ((x) <= elwix_Verbose) { \
+						char __str[0x10000] = { [0 ... 0xffff] = 0 }; \
+						snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \
+						syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \
+								(x), __func__, __LINE__, __str); \
+					} \
+				} while (0)
 
 /* Debug macros */
 extern int elwix_Debug;
@@ -269,6 +280,7 @@ extern int elwix_Debug;
 #define ELWIX_DEBUG_OFF		0x0
 #define ELWIX_DEBUG_TRACE	0x1
 #define ELWIX_DEBUG_LOG		0x2
+#define ELWIX_DEBUG_MEMORY	0x4
 #define ELWIX_DEBUG_ANY		0xFFFFFFFF
 
 #define ETRACE()		if (elwix_Debug & ELWIX_DEBUG_TRACE) \