- Fixed compile warnings

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index a53709fc0a0bbc48e9990db5dccb4282897ed818..267195c7ba662df281eab47d1534352898d2e818 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Piere-Alain Joye <pierre@php.net                             |
+  | Author: Piere-Alain Joye <pierre@php.net>                            |
   +----------------------------------------------------------------------+
 */
 
@@ -1080,7 +1080,7 @@ ZEND_GET_MODULE(zip)
 
 /* {{{ proto resource zip_open(string filename)
 Create new zip using source uri for output */
-static PHP_NAMED_FUNCTION(zif_zip_open)
+PHP_NAMED_FUNCTION(zif_zip_open)
 {
        char     *filename;
        int       filename_len;
@@ -1112,7 +1112,7 @@ static PHP_NAMED_FUNCTION(zif_zip_open)
 
 /* {{{ proto void zip_close(resource zip)
    Close a Zip archive */
-static PHP_NAMED_FUNCTION(zif_zip_close)
+PHP_NAMED_FUNCTION(zif_zip_close)
 {
        zval * zip;
        zip_rsrc *z_rsrc = NULL;
@@ -1129,7 +1129,7 @@ static PHP_NAMED_FUNCTION(zif_zip_close)
 
 /* {{{ proto resource zip_read(resource zip)
    Returns the next file in the archive */
-static PHP_NAMED_FUNCTION(zif_zip_read)
+PHP_NAMED_FUNCTION(zif_zip_read)
 {
        zval *zip_dp;
        zip_read_rsrc *zr_rsrc;
@@ -1172,7 +1172,7 @@ static PHP_NAMED_FUNCTION(zif_zip_read)
 /* {{{ proto bool zip_entry_open(resource zip_dp, resource zip_entry [, string mode])
    Open a Zip File, pointed by the resource entry */
 /* Dummy function to follow the old API */
-static PHP_NAMED_FUNCTION(zif_zip_entry_open)
+PHP_NAMED_FUNCTION(zif_zip_entry_open)
 {
        zval * zip;
        zval * zip_entry;
@@ -1199,7 +1199,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_open)
 /* {{{ proto void zip_entry_close(resource zip_ent)
    Close a zip entry */
 /* another dummy function to fit in the old api*/
-static PHP_NAMED_FUNCTION(zif_zip_entry_close)
+PHP_NAMED_FUNCTION(zif_zip_entry_close)
 {
        zval * zip_entry;
        zip_read_rsrc * zr_rsrc;
@@ -1216,7 +1216,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_close)
 
 /* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
    Read from an open directory entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_read)
+PHP_NAMED_FUNCTION(zif_zip_entry_read)
 {
        zval * zip_entry;
        long len = 0;
@@ -1315,7 +1315,7 @@ static void php_zip_entry_get_info(INTERNAL_FUNCTION_PARAMETERS, int opt) /* {{{
 
 /* {{{ proto string zip_entry_name(resource zip_entry)
    Return the name given a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_name)
+PHP_NAMED_FUNCTION(zif_zip_entry_name)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -1323,7 +1323,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_name)
 
 /* {{{ proto int zip_entry_compressedsize(resource zip_entry)
    Return the compressed size of a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
+PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -1331,7 +1331,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
 
 /* {{{ proto int zip_entry_filesize(resource zip_entry)
    Return the actual filesize of a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
+PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
 }
@@ -1339,7 +1339,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
 
 /* {{{ proto string zip_entry_compressionmethod(resource zip_entry)
    Return a string containing the compression method used on a particular entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
+PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
 }

diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 542af4b18bff0a65056ae1964c364b70d23029b2..1961e9431ad6f9434c988493dd1dc7a96ad99383 100644 (file)
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -94,16 +94,16 @@ extern php_stream_wrapper php_stream_zip_wrapper;
 #endif
 
 /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */
-static PHP_NAMED_FUNCTION(zif_zip_open);
-static PHP_NAMED_FUNCTION(zif_zip_read);
-static PHP_NAMED_FUNCTION(zif_zip_close);
-static PHP_NAMED_FUNCTION(zif_zip_entry_read);
-static PHP_NAMED_FUNCTION(zif_zip_entry_filesize);
-static PHP_NAMED_FUNCTION(zif_zip_entry_name);
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize);
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod);
-static PHP_NAMED_FUNCTION(zif_zip_entry_open);
-static PHP_NAMED_FUNCTION(zif_zip_entry_close);
+PHP_NAMED_FUNCTION(zif_zip_open);
+PHP_NAMED_FUNCTION(zif_zip_read);
+PHP_NAMED_FUNCTION(zif_zip_close);
+PHP_NAMED_FUNCTION(zif_zip_entry_read);
+PHP_NAMED_FUNCTION(zif_zip_entry_filesize);
+PHP_NAMED_FUNCTION(zif_zip_entry_name);
+PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize);
+PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod);
+PHP_NAMED_FUNCTION(zif_zip_entry_open);
+PHP_NAMED_FUNCTION(zif_zip_entry_close);
 
 #endif /* PHP_ZIP_H */