- Fix IMAP build problem

- Allow external DLLs to use warn_not_available

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index d1432e7fa859527345286c52e391488dc4d4fbce..a808e23a07edbb7eca5f2594b5607190cbcdfe3f 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -137,9 +137,9 @@ function_entry imap_functions[] = {
        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)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 13f8e1961f9e986ab097839fead0ec02357e60a4..1fa66fc1ca5ed79c2015265a8c01cc5eb1ad33fe 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2054,7 +2054,7 @@ PHP_FUNCTION(get_extension_funcs)
 
 
 /* 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;

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index b87b58264e6eb3a0a61b570b33829882d04cc6de..ddd7507b3a0ee989e0d7ef4e010abbb91521a9cb 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -106,7 +106,6 @@ PHP_FUNCTION(get_loaded_extensions);
 PHP_FUNCTION(extension_loaded);
 PHP_FUNCTION(get_extension_funcs);
 
-PHP_FUNCTION(warn_not_available);
 
 /* From the INI parser */
 PHP_FUNCTION(parse_ini_file);

diff --git a/main/php.h b/main/php.h
index c8a0a3699c73da736f79a24d0169dbe4ac471ea4..8b6b9dd11bbc6acfed926bea59a6e1adc3fe7df5 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -382,7 +382,7 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 #define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
 #endif
 
-PHP_FUNCTION(warn_not_available);
+PHPAPI PHP_FUNCTION(warn_not_available);
 
 #endif