From: Georg Richter <georg@php.net>
Date: Sun, 6 Jun 2004 08:52:19 +0000 (+0000)
Subject: removed conditional defines for load_data_infile_handlers on windows
X-Git-Tag: php-5.0.0RC3~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0468116c0236f7b04e187596cb88246d2e9814f;p=php

removed conditional defines for load_data_infile_handlers on windows
(4.1.2 windows build is fixed now on mysql.com)
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index fb5f6b0a64..95b6fe4d88 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1042,7 +1042,6 @@ PHP_FUNCTION(mysqli_kill)
 }
 /* }}} */
 
-#ifndef PHP_WIN32
 /* {{{ proto mysqli_set_local_infile_default(object link)
    unsets user defined handler for load local infile command */
 PHP_FUNCTION(mysqli_set_local_infile_default)
@@ -1105,7 +1104,6 @@ PHP_FUNCTION(mysqli_set_local_infile_handler)
 				&php_local_infile_end, &php_local_infile_error, (void *)mysql); 
 }
 /* }}} */
-#endif
 
 /* {{{ proto bool mysqli_more_results(object link)
    check if there any more query results from a multi query */
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index d6966408a2..b3021dd790 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -96,10 +96,8 @@ function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_info,									NULL)
 	PHP_FE(mysqli_insert_id,							NULL)
 	PHP_FE(mysqli_kill,									NULL)
-#ifndef PHP_WIN32
 	PHP_FE(mysqli_set_local_infile_default,				NULL)
 	PHP_FE(mysqli_set_local_infile_handler,				NULL)
-#endif
 	PHP_FE(mysqli_master_query,							NULL)
 	PHP_FE(mysqli_more_results,							NULL)
 	PHP_FE(mysqli_multi_query, 							NULL)
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 147a45a073..5d19b0e744 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -310,10 +310,8 @@ PHP_FUNCTION(mysqli_info);
 PHP_FUNCTION(mysqli_insert_id);
 PHP_FUNCTION(mysqli_init);
 PHP_FUNCTION(mysqli_kill);
-#ifndef PHP_WIN32
 PHP_FUNCTION(mysqli_set_local_infile_default);
 PHP_FUNCTION(mysqli_set_local_infile_handler);
-#endif
 PHP_FUNCTION(mysqli_master_query);
 PHP_FUNCTION(mysqli_more_results);
 PHP_FUNCTION(mysqli_multi_query);