From f867131e98f8f3d9bee2a6b9363a43e4488ec391 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Oct 2026 12:44:24 +0200 Subject: [PATCH] Remove HAVE_YAZ definition Not useful now. Used when YAZ was part of PHP core. --- config.m4 | 1 - config.w32 | 1 - php_yaz.c | 5 ----- php_yaz.h | 8 -------- 4 files changed, 15 deletions(-) diff --git a/config.m4 b/config.m4 index f8dd60f..f73e046 100644 --- a/config.m4 +++ b/config.m4 @@ -6,7 +6,6 @@ if test "$PHP_YAZ" = "yes"; then if pkg-config --exists yaz; then AC_MSG_RESULT([found]) if pkg-config --atleast-version 3.0.2 yaz; then - AC_DEFINE(HAVE_YAZ,1,[Whether you have YAZ]) lib=`pkg-config --libs yaz` for c in $lib; do case $c in diff --git a/config.w32 b/config.w32 index 24f0fd4..4009539 100644 --- a/config.w32 +++ b/config.w32 @@ -27,7 +27,6 @@ function yaz_check_version() if (PHP_YAZ != "no") { if (yaz_check_version() && CHECK_LIB("yaz5.lib", "yaz", PHP_YAZ)) { EXTENSION('yaz', 'php_yaz.c'); - AC_DEFINE('HAVE_YAZ', 1); } else { WARNING("yaz not enabled; libraries and headers not found"); } diff --git a/php_yaz.c b/php_yaz.c index 9ec4a4a..6b7ddb9 100644 --- a/php_yaz.c +++ b/php_yaz.c @@ -10,8 +10,6 @@ #include "php.h" #include "php_ini.h" -#if HAVE_YAZ - #include "ext/standard/info.h" #include @@ -2399,9 +2397,6 @@ zend_module_entry yaz_module_entry = { STANDARD_MODULE_PROPERTIES }; - -#endif - /* * Local variables: * tab-width: 4 diff --git a/php_yaz.h b/php_yaz.h index 576c5f0..3c6d47c 100644 --- a/php_yaz.h +++ b/php_yaz.h @@ -8,8 +8,6 @@ #define PHP_YAZ_VERSION "1.2.5" -#if HAVE_YAZ - #ifdef ZTS #include "TSRM.h" #endif @@ -60,11 +58,5 @@ ZEND_END_MODULE_GLOBALS(yaz) #else #define YAZSG(v) (yaz_globals.v) #endif - -#else - -#define yaz_module_ptr NULL -#endif - #define phpext_yaz_ptr yaz_module_ptr #endif