--- libelwix/inc/elwix.h	2014/02/21 13:15:32	1.10.12.1
+++ libelwix/inc/elwix.h	2016/05/18 12:47:42	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.10.12.1 2014/02/21 13:15:32 misho Exp $
+* $Id: elwix.h,v 1.14 2016/05/18 12:47:42 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 - 2014
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,16 +49,20 @@ SUCH DAMAGE.
 
 #include <assert.h>
 #include <syslog.h>
+#include <stdarg.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>
+#ifndef __linux__
+#include <sys/limits.h>
+#include <sys/endian.h>
 #include <net/if_dl.h>
+#endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <elwix/aqueue.h>
 #include <elwix/atree.h>
 #include <elwix/ampool.h>
 #include <elwix/acrc.h>
@@ -210,6 +214,25 @@ void elwixFini();
  */
 int elwix_byteOrder();
 
+#ifndef strlcpy
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t strlcpy(char *dst, const char *src, size_t siz);
+#endif
+#ifndef strlcat
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
 /* memory management hooks */
 extern void *(*e_malloc)(size_t);
 extern void *(*e_calloc)(size_t, size_t);
@@ -262,6 +285,12 @@ extern int elwix_Debug;
 								__func__, __LINE__, __str); \
 				} while (0)
 
+#define EWARNING(x, fmt, ...)	do { assert((fmt)); \
+					char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \
+					snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \
+					syslog(LOG_WARNING, "Warning:%s(%d): #%d - %s\n", \
+							 __func__, __LINE__, (x), __str); \
+				} while (0)
 /* Error state macros */
 #define EERROR(x, fmt, ...)	do { assert((fmt)); \
 					char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \