diff options
| author | George Peter Banyard <girgias@php.net> | 2020-05-20 17:36:14 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-05-20 18:22:10 +0200 |
| commit | 3092a1ee12b864352ceeea56a4f4dc8c19a48f63 (patch) | |
| tree | 36d482cf3addb7f2bd3f512baa4d43daa7676cb8 | |
| parent | 999f65c9cd73b17fcfa155a9c0d1675684d3b778 (diff) | |
| download | php-git-3092a1ee12b864352ceeea56a4f4dc8c19a48f63.tar.gz | |
Fix [-Wundef] warning in PHAR extension
| -rw-r--r-- | ext/phar/phar_object.c | 2 | ||||
| -rw-r--r-- | ext/phar/stream.c | 4 | ||||
| -rw-r--r-- | ext/phar/tar.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index f1a7ade1fd..d67c4dee47 100644 --- 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 d6384b7256..f3de4dde25 100644 --- 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 773bdbca70..89b91b25f9 100644 --- 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; |