Fix for #32531

No need to alias these functions on windows or if the mssql extension is compiled. This change will allow the use of both extensions at the same time.

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 79d5ff1c770c17532e982f713bceab2b72bffc16..ae46a5703700a18ec45f99ab6e701d847f7b0a60 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -100,6 +100,8 @@ function_entry sybase_functions[] = {
        PHP_FE(sybase_affected_rows,            NULL)
        PHP_FE(sybase_min_error_severity,       NULL)
        PHP_FE(sybase_min_message_severity,     NULL)
+
+#if !defined(PHP_WIN32) && !defined(HAVE_MSSQL)
        PHP_FALIAS(mssql_connect,               sybase_connect,                 NULL)
        PHP_FALIAS(mssql_pconnect,              sybase_pconnect,                NULL)
        PHP_FALIAS(mssql_close,                 sybase_close,                   NULL)
@@ -119,6 +121,7 @@ function_entry sybase_functions[] = {
        PHP_FALIAS(mssql_affected_rows,         sybase_affected_rows,                   NULL)
        PHP_FALIAS(mssql_min_error_severity,    sybase_min_error_severity,              NULL)
        PHP_FALIAS(mssql_min_message_severity,  sybase_min_message_severity,    NULL)
+#endif
        {NULL, NULL, NULL}
 };
 

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 817409bc2a704fc37310c66345f6242514475f05..ce20b9d0d46315b3991d3950e3c3fe5f57a6f140 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -62,6 +62,7 @@ function_entry sybase_functions[] = {
        PHP_FE(sybase_set_message_handler, NULL)
        PHP_FE(sybase_deadlock_retry_count, NULL)
 
+#if !defined(PHP_WIN32) && !defined(HAVE_MSSQL)
        PHP_FALIAS(mssql_connect, sybase_connect, NULL)
        PHP_FALIAS(mssql_pconnect, sybase_pconnect, NULL)
        PHP_FALIAS(mssql_close, sybase_close, NULL)
@@ -85,6 +86,7 @@ function_entry sybase_functions[] = {
        PHP_FALIAS(mssql_min_server_severity, sybase_min_server_severity, NULL)
        PHP_FALIAS(mssql_set_message_handler, sybase_set_message_handler, NULL)
        PHP_FALIAS(mssql_deadlock_retry_count, sybase_deadlock_retry_count, NULL)
+#endif
 
        {NULL, NULL, NULL}
 };