zeev Mon Jul 28 03:28:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mysql/libmysql libmysql.c mysql_com.h net.c
Log:
Fix nameclash with NSAPI API
Index: php-src/ext/mysql/libmysql/libmysql.c
diff -u php-src/ext/mysql/libmysql/libmysql.c:1.11.2.2
php-src/ext/mysql/libmysql/libmysql.c:1.11.2.3
--- php-src/ext/mysql/libmysql/libmysql.c:1.11.2.2 Sat Jun 7 12:12:09 2003
+++ php-src/ext/mysql/libmysql/libmysql.c Mon Jul 28 03:28:55 2003
@@ -1510,7 +1510,7 @@
/* without encryption? */
if (client_flag & CLIENT_SSL)
{
- if (my_net_write(net,buff,(uint) (2)) || net_flush(net))
+ if (my_net_write(net,buff,(uint) (2)) || my_net_flush(net))
goto error;
/* Do the SSL layering. */
DBUG_PRINT("info", ("IO layer change in progress..."));
@@ -1543,7 +1543,7 @@
mysql->db=my_strdup(db,MYF(MY_WME));
db=0;
}
- if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net) ||
+ if (my_net_write(net,buff,(uint) (end-buff)) || my_net_flush(net) ||
net_safe_read(mysql) == packet_error)
goto error;
if (client_flag & CLIENT_COMPRESS) /* We will use compression */
@@ -1808,7 +1808,7 @@
mysql->net.last_errno=EE_FILENOTFOUND;
sprintf(buf,EE(mysql->net.last_errno),tmp_name,errno);
strmake(mysql->net.last_error,buf,sizeof(mysql->net.last_error)-1);
- my_net_write(&mysql->net,"",0); net_flush(&mysql->net);
+ my_net_write(&mysql->net,"",0); my_net_flush(&mysql->net);
my_free(tmp_name,MYF(0));
DBUG_RETURN(-1);
}
@@ -1827,7 +1827,7 @@
}
(void) my_close(fd,MYF(0));
/* Send empty packet to mark end of file */
- if (my_net_write(&mysql->net,"",0) || net_flush(&mysql->net))
+ if (my_net_write(&mysql->net,"",0) || my_net_flush(&mysql->net))
{
mysql->net.last_errno=CR_SERVER_LOST;
sprintf(mysql->net.last_error,ER(mysql->net.last_errno),socket_errno);
Index: php-src/ext/mysql/libmysql/mysql_com.h
diff -u php-src/ext/mysql/libmysql/mysql_com.h:1.9
php-src/ext/mysql/libmysql/mysql_com.h:1.9.4.1
--- php-src/ext/mysql/libmysql/mysql_com.h:1.9 Fri Jun 7 11:07:54 2002
+++ php-src/ext/mysql/libmysql/mysql_com.h Mon Jul 28 03:28:55 2003
@@ -146,7 +146,7 @@
int my_net_init(NET *net, Vio* vio);
void net_end(NET *net);
void net_clear(NET *net);
-int net_flush(NET *net);
+int my_net_flush(NET *net);
int my_net_write(NET *net,const char *packet,unsigned long len);
int net_write_command(NET *net,unsigned char command,const char *packet,
unsigned long len);
Index: php-src/ext/mysql/libmysql/net.c
diff -u php-src/ext/mysql/libmysql/net.c:1.7 php-src/ext/mysql/libmysql/net.c:1.7.4.1
--- php-src/ext/mysql/libmysql/net.c:1.7 Fri Jun 7 11:07:54 2002
+++ php-src/ext/mysql/libmysql/net.c Mon Jul 28 03:28:55 2003
@@ -183,10 +183,10 @@
/* Flush write_buffer if not empty. */
-int net_flush(NET *net)
+int my_net_flush(NET *net)
{
int error=0;
- DBUG_ENTER("net_flush");
+ DBUG_ENTER("my_net_flush");
if (net->buff != net->write_pos)
{
error=net_real_write(net,(char*) net->buff,
@@ -231,7 +231,7 @@
buff[4]=command;
if (net_write_buff(net,(char*) buff,5))
return 1;
- return test(net_write_buff(net,packet,len) || net_flush(net));
+ return test(net_write_buff(net,packet,len) || my_net_flush(net));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
