Merged in remicollet/ext-ircclient/issue-030 (pull request #2)

More fix

diff --git a/package.xml b/package.xml
index c5681d57aefc2dd0b7e684c59f37122ced413f47..7e01e1d790efdfc4f081d7a41e53cb0efc0ea307 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -23,7 +23,7 @@
  </lead>
  <date>2014-01-10</date>
  <version>
-  <release>0.3.0</release>
+  <release>0.3.1</release>
   <api>0.3.0</api>
  </version>
  <stability>
@@ -32,7 +32,8 @@
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* PECL release
+* Fixed some compile warnings (remi)
+* Fixed build portability problem (remi)
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_ircclient.c b/php_ircclient.c
index bf17d5ed44aad1b2014db8541b8020fc16ded12c..e1e6ab65be1dc7d39cc07b30eae784e5ccc75a95 100644 (file)
--- a/php_ircclient.c
+++ b/php_ircclient.c
@@ -1418,14 +1418,15 @@ PHP_MINFO_FUNCTION(ircclient)
 {
        unsigned int high, low;
        char *version[2];
+       char *lt16 = "<=1.6";
 
        irc_get_version(&high, &low);
        spprintf(&version[1], 0, "%u.%u", high, low);
 #if PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH
        spprintf(&version[0], 0, "%u.%u", PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH, PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW);
 #else
-       /* version <= 1.6 doesn't exposed its version */
-       spprintf(&version[0], 0, "-");
+       /* version <= 1.6 doesn't expose its version */
+       version[0] = lt16;
 #endif
        php_info_print_table_start();
        php_info_print_table_header(2, "IRC client support", "enabled");
@@ -1441,7 +1442,9 @@ PHP_MINFO_FUNCTION(ircclient)
        );
        php_info_print_table_end();
 
-       efree(version[0]);
+       if (version[0] != lt16) {
+               efree(version[0]);
+       }
        efree(version[1]);
 }
 

diff --git a/php_ircclient.h b/php_ircclient.h
index ce668a0c1dc8a001d8d16edea3c99473da3a9586..d9d81e2d1cec06e45d47175a31b0be6b25ca16a1 100644 (file)
--- a/php_ircclient.h
+++ b/php_ircclient.h
@@ -6,14 +6,14 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2011, Michael Wallner <mike@php.net>                 |
+    | Copyright (c) 2014, Michael Wallner <mike@php.net>                 |
     +--------------------------------------------------------------------+
 */
 
 #ifndef PHP_IRCCLIENT_H
 #define PHP_IRCCLIENT_H
 
-#define PHP_IRCCLIENT_VERSION "0.3.0"
+#define PHP_IRCCLIENT_VERSION "0.3.1"
 
 extern zend_module_entry ircclient_module_entry;
 #define phpext_ircclient_ptr &ircclient_module_entry