--- mqtt/inc/defs.h	2011/12/12 09:24:24	1.1.1.1.2.19
+++ mqtt/inc/defs.h	2012/07/03 07:48:48	1.2.2.3
@@ -3,9 +3,8 @@
 
 
 #define STRSIZ			256
-#define MAX_CONNID		24
-#define MAX_CRED		13
-#define MQTTMSG_MAX		65529
+#define RETAIN_TIMEOUT		1
+#if 0
 #define WILDCARDS		"/#+"
 #define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
 
@@ -13,6 +12,8 @@
 #define MQTT_CONN_STR		"MQIsdp"
 #define MQTT_PROTO_VER		3
 #define MQTT_KEEPALIVE		10
+#define MQTT_DEFAULT_MSGID	0xDEBA
+#endif
 
 #define DEFAULT_RETRY		1
 #define DEFAULT_CONFIG		"/etc/mqtt.conf"
@@ -21,25 +22,9 @@
 #define MQTT_USER		"mqtt"
 
 
-#define VERB(x)		if ((x) <= Verbose)
-#define FTRACE(x)	VERB((x)) syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__);
-
-#define LOGERR		{ \
-				mqtt_Errno = errno; \
-				strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
-			}
-
-
-extern int mqtt_Errno;
-extern char mqtt_Error[STRSIZ];
-extern struct tagCallbacks call;
-
 extern char cliCmd[], *cliStr[];
 
-inline void mqtt_SetErr(int eno, char *estr, ...);
-inline struct mqtthdr *_mqtt_readHEADER(mqtt_msg_t * __restrict, u_char, int *, int *);
-
-extern int Verbose, Kill;
+extern volatile intptr_t Kill;
 
 extern struct tagCallbacks call;
 extern sqlite3 *acc, *pub;