Fix [-Wundef] warning in PHAR extension

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index f1a7ade1fd2c11214cf89c226622722addb1a055..d67c4dee47abdfea9a92e9746ec5ebf4360ea7e9 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1274,7 +1274,7 @@ PHP_METHOD(Phar, getSupportedSignatures)
        add_next_index_stringl(return_value, "SHA-1", 5);
        add_next_index_stringl(return_value, "SHA-256", 7);
        add_next_index_stringl(return_value, "SHA-512", 7);
-#if PHAR_HAVE_OPENSSL
+#ifdef PHAR_HAVE_OPENSSL
        add_next_index_stringl(return_value, "OpenSSL", 7);
 #else
        if (zend_hash_str_exists(&module_registry, "openssl", sizeof("openssl")-1)) {

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index d6384b72567298edf04f93091877aa4a7e2f2989..f3de4dde252493eaf70e7c309b82f09d2b1378be 100644 (file)
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -90,7 +90,7 @@ php_url* phar_parse_url(php_stream_wrapper *wrapper, const char *filename, const
        resource->path = zend_string_init(entry, entry_len, 0);
        efree(entry);
 
-#if MBO_0
+#ifdef MBO_0
                if (resource) {
                        fprintf(stderr, "Alias:     %s\n", alias);
                        fprintf(stderr, "Scheme:    %s\n", ZSTR_VAL(resource->scheme));
@@ -299,7 +299,7 @@ idata_error:
                }
        }
        php_url_free(resource);
-#if MBO_0
+#ifdef MBO_0
                fprintf(stderr, "Pharname:   %s\n", idata->phar->filename);
                fprintf(stderr, "Filename:   %s\n", internal_file);
                fprintf(stderr, "Entry:      %s\n", idata->internal_file->filename);

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 773bdbca709f8691393cd10bc3e86a048dd03d35..89b91b25f9d758ea58f19b8f435f96fd38b6a627 100644 (file)
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -203,7 +203,7 @@ static int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp) /*
 }
 /* }}} */
 
-#if !HAVE_STRNLEN
+#ifndef HAVE_STRNLEN
 static size_t strnlen(const char *s, size_t maxlen) {
         char *r = (char *)memchr(s, '\0', maxlen);
         return r ? r-s : maxlen;