--- libaitwww/inc/aitwww.h	2012/09/20 14:19:45	1.5
+++ libaitwww/inc/aitwww.h	2013/05/30 09:25:35	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitwww.h,v 1.5 2012/09/20 14:19:45 misho Exp $
+* $Id: aitwww.h,v 1.6 2013/05/30 09:25:35 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
-#include <aitio.h>
+#include <elwix.h>
 
 
 /* URL staff ... */
@@ -116,9 +116,9 @@ typedef int (*list_cb_t)(struct tagCGI *, void *);
 
 
 // www_GetErrno() Get error code of last operation
-inline int www_GetErrno();
+int www_GetErrno();
 // www_GetError() Get error text of last operation
-inline const char *www_GetError();
+const char *www_GetError();
 
 
 /*
@@ -158,7 +158,7 @@ cgi_t *www_parseMultiPart(const char *str, int ctlen, 
  * @name = Name of cgi variable
  * return: NULL not found or !=NULL value
  */
-inline const char *www_getValue(cgi_t * __restrict cgi, const char *name);
+const char *www_getValue(cgi_t * __restrict cgi, const char *name);
 /*
  * www_addValue() - Add new or update if exists CGI variable
  *
@@ -184,7 +184,7 @@ int www_delPair(cgi_t * __restrict cgi, const char *na
  * @arg = Optional argument pass through callback
  * return: -1 error or >-1 number of elements
  */
-inline int www_listPairs(cgi_t * __restrict cgi, list_cb_t func, void *arg);
+int www_listPairs(cgi_t * __restrict cgi, list_cb_t func, void *arg);
 
 /*
  * www_header() - Output initial html header
@@ -192,7 +192,7 @@ inline int www_listPairs(cgi_t * __restrict cgi, list_
  * @output = file handle
  * return: <1 error or >0 writed bytes
  */
-inline int www_header(FILE *output);
+int www_header(FILE *output);
 
 /*
  * www_parseAttributes() - Parse attributes
@@ -200,7 +200,7 @@ inline int www_header(FILE *output);
  * @ct = Content type
  * return: NULL error or !=NULL attributes
  */
-inline cgi_t *www_parseAttributes(const char **ct);
+cgi_t *www_parseAttributes(const char **ct);
 /*
  * www_getAttribute() - Get Attribute from attribute session
  *
@@ -208,7 +208,7 @@ inline cgi_t *www_parseAttributes(const char **ct);
  * @name = Name of attribute variable
  * return: NULL not found or !=NULL value
  */
-inline ait_val_t *www_getAttribute(cgi_t * __restrict cgi, const char *name);
+ait_val_t *www_getAttribute(cgi_t * __restrict cgi, const char *name);
 
 
 /*
@@ -232,7 +232,7 @@ int www_cmptype(const char *ct, const char *type);
  *
  * @str = query string
  * @delim = delimiter
- * return: NULL error or AV pair, must be io_free() after use!
+ * return: NULL error or AV pair, must be e_free() after use!
  */
 ait_val_t *www_getpair(char ** __restrict str, const char *delim);
 /*
@@ -241,19 +241,19 @@ ait_val_t *www_getpair(char ** __restrict str, const c
  * @str = string
  * return: digit
  */
-inline char www_x2c(const char *str);
+char www_x2c(const char *str);
 /*
  * www_unescape() - Unescape/decode WWW query string to host string
  *
  * @str = string
  * return: none
  */
-inline void www_unescape(char * __restrict str);
+void www_unescape(char * __restrict str);
 /*
  * www_undot() - Undotted and clean WWW query filename
  *
  * @pname = query filename
- * return: =NULL error or !=NULL allocated valid filename, after use you must call io_freeVar()
+ * return: =NULL error or !=NULL allocated valid filename, after use you must call ait_freeVar()
  */
 ait_val_t *www_undot(const char * __restrict pname);
 
@@ -264,14 +264,14 @@ ait_val_t *www_undot(const char * __restrict pname);
  * @url = Input URL
  * return: -1 error or 0 ok
  */
-inline int www_URLInit(struct tagIOURL * __restrict url);
+int www_URLInit(struct tagIOURL * __restrict url);
 /*
  * www_URLFree() - URL free structure
  *
  * @url = Input parsed URL
  * return: none
  */
-inline void www_URLFree(struct tagIOURL * __restrict url);
+void www_URLFree(struct tagIOURL * __restrict url);
 /*
  * www_URLGet() - Parse and get data from input URL
  *
@@ -304,14 +304,14 @@ int www_XMLGet(const char *csXML, struct tagReqXML *xm
  * www_b64encode() - Base64 encode function
  *
  * @src = source data
- * return: NULL error or !=NULL encoded variable, after use call io_freeVar()
+ * return: NULL error or !=NULL encoded variable, after use call ait_freeVar()
  */
 ait_val_t *www_b64encode(ait_val_t * __restrict src);
 /*
  * www_b64decode() - Base64 decode function
  *
  * @src = source encoded data
- * return: NULL error or !=NULL decoded variable, after use call io_freeVar()
+ * return: NULL error or !=NULL decoded variable, after use call ait_freeVar()
  */
 ait_val_t *www_b64decode(ait_val_t * __restrict src);