--- libaitmqtt/inc/defs.h	2012/01/26 13:07:33	1.1
+++ libaitmqtt/inc/defs.h	2012/07/22 22:02:44	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.1 2012/01/26 13:07:33 misho Exp $
+* $Id: defs.h,v 1.3 2012/07/22 22:02:44 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
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,18 +47,14 @@ SUCH DAMAGE.
 #define __DEFS_H
 
 
+#ifndef STRSIZ
 #define STRSIZ			256
-#define MAX_CONNID		24
-#define MAX_CRED		13
-#define MQTTMSG_MAX		65529
+#endif
+
 #define WILDCARDS		"/#+"
 #define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
 
-#define MQTT_DATA_MAX		268435455
 #define MQTT_CONN_STR		"MQIsdp"
-#define MQTT_PROTO_VER		3
-#define MQTT_KEEPALIVE		10
-#define MQTT_DEFAULT_MSGID	0xDEBA
 
 
 #define LOGERR		{ \
@@ -70,8 +66,10 @@ SUCH DAMAGE.
 extern int mqtt_Errno;
 extern char mqtt_Error[STRSIZ];
 
-inline void mqtt_SetErr(int eno, char *estr, ...);
+inline void mqtt_SetErr(int, char *, ...);
 inline struct mqtthdr *_mqtt_readHEADER(mqtt_msg_t * __restrict, u_char, int *, int *);
+
+inline int mqtt_wait4data(int, u_short, short);
 
 
 #endif