--- libelwix/inc/elwix.h	2016/08/11 13:19:16	1.14.8.1
+++ libelwix/inc/elwix.h	2019/12/30 18:10:17	1.17.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.14.8.1 2016/08/11 13:19:16 misho Exp $
+* $Id: elwix.h,v 1.17.2.1 2019/12/30 18:10:17 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 - 2015
+Copyright 2004 - 2019
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,7 @@ SUCH DAMAGE.
 #include <elwix/atime.h>
 #include <elwix/apack.h>
 #include <elwix/apio.h>
+#include <elwix/ajson.h>
 
 
 #ifndef STRSIZ
@@ -256,13 +257,23 @@ extern int elwix_Verbose;
 					if ((x) <= elwix_Verbose) { \
 						char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \
 						snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \
-						syslog(LOG_DEBUG, "Verbose(%d):%s(%d): %s\n", \
+						syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \
 								(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;
+#define e_Debug			elwix_Debug
+
 #define ELWIX_DEBUG_OFF		0x0
 #define ELWIX_DEBUG_TRACE	0x1
 #define ELWIX_DEBUG_LOG		0x2
@@ -301,10 +312,13 @@ extern int elwix_Debug;
 							 __func__, __LINE__, (x), __str); \
 				} while (0)
 #define ESYSERR(x)		do { \
-					if (x > 0 || errno) \
+					if (x > 0 || errno) { \
+						int _ern = errno; \
 						syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \
 								__func__, __LINE__, x > 0 ? x : errno, \
 								strerror(x > 0 ? x : errno)); \
+						errno = _ern; \
+					} \
 				} while (0)
 #define ELIBERR(ait)		do { \
 					if (ait##_GetErrno()) \