Merge branch 'master' of github.com:mgdm/Mosquitto-PHP

Conflicts: mosquitto.c
mgdm · Oct 4, 2013 · d7915c1 · d7915c1
2 parents d2e7c41 + 64309f4
commit d7915c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -6,3 +6,9 @@ This is an extension to allow using the [Mosquitto MQTT library](http:https://mosquitt
 
 * PHP 5.4+ (I'll probably fix it for 5.3 shortly)
 * libmosquitto 1.2.1 (this is the only version I have tested)
+
+## To do
+
+* ZTS support
+* Arginfo
+* Tests
diff --git a/php_mosquitto.h b/php_mosquitto.h
@@ -116,6 +116,7 @@ PHP_MOSQUITTO_API void php_mosquitto_connect_callback(struct mosquitto *mosq, vo
 PHP_MOSQUITTO_API void php_mosquitto_disconnect_callback(struct mosquitto *mosq, void *obj, int rc);
 PHP_MOSQUITTO_API void php_mosquitto_message_callback(struct mosquitto *mosq, void *client_obj, const struct mosquitto_message *message);
 PHP_MOSQUITTO_API void php_mosquitto_subscribe_callback(struct mosquitto *mosq, void *client_obj, int mid, int qos_count, const int *granted_qos);
+PHP_MOSQUITTO_API void php_mosquitto_disconnect_callback(struct mosquitto *mosq, void *obj, int rc);
 
 char *php_mosquitto_strerror_wrapper(int err);
 void php_mosquitto_handle_errno(int retval, int err);