Skip to content

Commit 4311aa6

Browse files
remicolletremicollet
committed
Fix [-Wundef] warnings
from 5f0128e1e0e0deef350df659da69dddfc2cec0c7
1 parent 527c199 commit 4311aa6

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

‎php5/php_zip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,7 +3856,7 @@ static PHP_MINIT_FUNCTION(zip)
38563856
REGISTER_ZIP_CLASS_CONST_LONG("EM_UNKNOWN", ZIP_EM_UNKNOWN);
38573857

38583858

3859-
#if HAVE_LIBZIP_VERSION
3859+
#ifdef HAVE_LIBZIP_VERSION
38603860
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version() TSRMLS_CC);
38613861
#else
38623862
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION TSRMLS_CC);
@@ -3890,7 +3890,7 @@ static PHP_MINFO_FUNCTION(zip)
38903890

38913891
php_info_print_table_row(2, "Zip", "enabled");
38923892
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
3893-
#if HAVE_LIBZIP_VERSION
3893+
#ifdef HAVE_LIBZIP_VERSION
38943894
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
38953895
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
38963896
#else

‎php5/zip_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# include "config.h"
2121
#endif
2222
#include "php.h"
23-
#if HAVE_ZIP
23+
#ifdef HAVE_ZIP
2424
#ifdef ZEND_ENGINE_2
2525

2626
#include "php_streams.h"

‎php7/php_zip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3754,7 +3754,7 @@ static PHP_MINIT_FUNCTION(zip)
37543754
#endif
37553755
REGISTER_ZIP_CLASS_CONST_LONG("EM_UNKNOWN", ZIP_EM_UNKNOWN);
37563756

3757-
#if HAVE_LIBZIP_VERSION
3757+
#ifdef HAVE_LIBZIP_VERSION
37583758
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
37593759
#else
37603760
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
@@ -3787,7 +3787,7 @@ static PHP_MINFO_FUNCTION(zip)
37873787

37883788
php_info_print_table_row(2, "Zip", "enabled");
37893789
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
3790-
#if HAVE_LIBZIP_VERSION
3790+
#ifdef HAVE_LIBZIP_VERSION
37913791
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
37923792
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
37933793
#else

‎php7/zip_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# include "config.h"
2121
#endif
2222
#include "php.h"
23-
#if HAVE_ZIP
23+
#ifdef HAVE_ZIP
2424

2525
#include "php_streams.h"
2626
#include "ext/standard/file.h"

‎php73/php_zip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3755,7 +3755,7 @@ static PHP_MINIT_FUNCTION(zip)
37553755
#endif
37563756
REGISTER_ZIP_CLASS_CONST_LONG("EM_UNKNOWN", ZIP_EM_UNKNOWN);
37573757

3758-
#if HAVE_LIBZIP_VERSION
3758+
#ifdef HAVE_LIBZIP_VERSION
37593759
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
37603760
#else
37613761
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
@@ -3788,7 +3788,7 @@ static PHP_MINFO_FUNCTION(zip)
37883788

37893789
php_info_print_table_row(2, "Zip", "enabled");
37903790
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
3791-
#if HAVE_LIBZIP_VERSION
3791+
#ifdef HAVE_LIBZIP_VERSION
37923792
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
37933793
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
37943794
#else

‎php73/zip_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# include "config.h"
2121
#endif
2222
#include "php.h"
23-
#if HAVE_ZIP
23+
#ifdef HAVE_ZIP
2424

2525
#include "php_streams.h"
2626
#include "ext/standard/file.h"

‎php74/php_zip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3600,7 +3600,7 @@ static PHP_MINIT_FUNCTION(zip)
36003600
#endif
36013601
REGISTER_ZIP_CLASS_CONST_LONG("EM_UNKNOWN", ZIP_EM_UNKNOWN);
36023602

3603-
#if HAVE_LIBZIP_VERSION
3603+
#ifdef HAVE_LIBZIP_VERSION
36043604
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
36053605
#else
36063606
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
@@ -3633,7 +3633,7 @@ static PHP_MINFO_FUNCTION(zip)
36333633

36343634
php_info_print_table_row(2, "Zip", "enabled");
36353635
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
3636-
#if HAVE_LIBZIP_VERSION
3636+
#ifdef HAVE_LIBZIP_VERSION
36373637
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
36383638
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
36393639
#else

‎php74/zip_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# include "config.h"
2121
#endif
2222
#include "php.h"
23-
#if HAVE_ZIP
23+
#ifdef HAVE_ZIP
2424

2525
#include "php_streams.h"
2626
#include "ext/standard/file.h"

‎php8/php_zip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3323,7 +3323,7 @@ static PHP_MINIT_FUNCTION(zip)
33233323
#endif
33243324
REGISTER_ZIP_CLASS_CONST_LONG("EM_UNKNOWN", ZIP_EM_UNKNOWN);
33253325

3326-
#if HAVE_LIBZIP_VERSION
3326+
#ifdef HAVE_LIBZIP_VERSION
33273327
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
33283328
#else
33293329
zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
@@ -3356,7 +3356,7 @@ static PHP_MINFO_FUNCTION(zip)
33563356

33573357
php_info_print_table_row(2, "Zip", "enabled");
33583358
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
3359-
#if HAVE_LIBZIP_VERSION
3359+
#ifdef HAVE_LIBZIP_VERSION
33603360
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
33613361
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
33623362
#else

‎php8/zip_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# include "config.h"
1919
#endif
2020
#include "php.h"
21-
#if HAVE_ZIP
21+
#ifdef HAVE_ZIP
2222

2323
#include "php_streams.h"
2424
#include "ext/standard/file.h"

0 commit comments

Comments
 (0)