cvs: php4 /ext/imap php_imap.c /ext/standard basic_functions.c basic_functions.h /main php.h

zeev Thu Aug 24 11:49:49 2000 EDT Modified files: /php4/ext/imap php_imap.c /php4/ext/standard basic_functions.c basic_functions.h /php4/main php.h Log: - Fix IMAP build problem - Allow external DLLs to use warn_not_available Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.43 php4/ext/imap/php_imap.c:1.44 --- php4/ext/imap/php_imap.c:1.43 Mon Aug 21 19:35:30 2000 +++ php4/ext/imap/php_imap.c Thu Aug 24 11:49:48 2000 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.43 2000/08/22 02:35:30 chagenbu Exp $ */ +/* $Id: php_imap.c,v 1.44 2000/08/24 18:49:48 zeev Exp $ */ #define IMAP41 @@ -137,9 +137,9 @@ PHP_FE(imap_errors, NULL) PHP_FE(imap_last_error, NULL) #ifndef PHP_WIN32 - PHP_FALIAS(imap_mail, warn_not_available, NULL) -#else PHP_FE(imap_mail, NULL) +#else + PHP_FALIAS(imap_mail, warn_not_available, NULL) #endif PHP_FE(imap_search, NULL) PHP_FE(imap_utf7_decode, NULL) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.239 php4/ext/standard/basic_functions.c:1.240 --- php4/ext/standard/basic_functions.c:1.239 Sun Aug 20 09:09:06 2000 +++ php4/ext/standard/basic_functions.c Thu Aug 24 11:49:48 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.239 2000/08/20 16:09:06 stas Exp $ */ +/* $Id: basic_functions.c,v 1.240 2000/08/24 18:49:48 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -2054,7 +2054,7 @@ /* This function is not directly accessible to end users */ -PHP_FUNCTION(warn_not_available) +PHPAPI PHP_FUNCTION(warn_not_available) { php_error(E_WARNING, "%s() is not supported in this PHP build", get_active_function_name()); RETURN_FALSE; Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.59 php4/ext/standard/basic_functions.h:1.60 --- php4/ext/standard/basic_functions.h:1.59 Mon Aug 21 02:50:52 2000 +++ php4/ext/standard/basic_functions.h Thu Aug 24 11:49:48 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.59 2000/08/21 09:50:52 sas Exp $ */ +/* $Id: basic_functions.h,v 1.60 2000/08/24 18:49:48 zeev Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -106,7 +106,6 @@ PHP_FUNCTION(extension_loaded); PHP_FUNCTION(get_extension_funcs); -PHP_FUNCTION(warn_not_available); /* From the INI parser */ PHP_FUNCTION(parse_ini_file); Index: php4/main/php.h diff -u php4/main/php.h:1.115 php4/main/php.h:1.116 --- php4/main/php.h:1.115 Mon Aug 21 02:50:53 2000 +++ php4/main/php.h Thu Aug 24 11:49:49 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.115 2000/08/21 09:50:53 sas Exp $ */ +/* $Id: php.h,v 1.116 2000/08/24 18:49:49 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -382,7 +382,7 @@ #define XtOffsetOf(s_type,field) XtOffset(s_type*,field) #endif -PHP_FUNCTION(warn_not_available); +PHPAPI PHP_FUNCTION(warn_not_available); #endif