diff options
| -rw-r--r-- | ext/mysqlnd/config.w32 | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/config9.m4 | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 1 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_driver.c | 1 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_vio.c (renamed from ext/mysqlnd/mysqlnd_net.c) | 0 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_vio.h (renamed from ext/mysqlnd/mysqlnd_net.h) | 0 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32 index ff102310dd..c9d9496600 100644 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@ -16,7 +16,7 @@ if (PHP_MYSQLND != "no") { "mysqlnd_ext_plugin.c " + "mysqlnd_loaddata.c " + "mysqlnd_reverse_api.c " + - "mysqlnd_net.c " + + "mysqlnd_vio.c " + "mysqlnd_plugin.c " + "mysqlnd_ps.c " + "mysqlnd_ps_codec.c " + diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 92cab94367..b6bb25ce6e 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -19,7 +19,7 @@ dnl If some extension uses mysqlnd it will get compiled in PHP core if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c" mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \ - mysqlnd_loaddata.c mysqlnd_reverse_api.c mysqlnd_net.c \ + mysqlnd_loaddata.c mysqlnd_reverse_api.c mysqlnd_vio.c \ mysqlnd_statistics.c mysqlnd_driver.c mysqlnd_ext_plugin.c mysqlnd_auth.c \ mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_debug.c\ mysqlnd_block_alloc.c mysqlnd_plugin.c php_mysqlnd.c" diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 616c5c379f..8d5140a2ae 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -21,6 +21,7 @@ /* $Id$ */ #include "php.h" #include "mysqlnd.h" +#include "mysqlnd_vio.h" #include "mysqlnd_wireprotocol.h" #include "mysqlnd_priv.h" #include "mysqlnd_result.h" diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index ed4506322e..b12c0f8ea3 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -21,6 +21,7 @@ /* $Id: mysqlnd.c 317989 2011-10-10 20:49:28Z andrey $ */ #include "php.h" #include "mysqlnd.h" +#include "mysqlnd_vio.h" #include "mysqlnd_wireprotocol.h" #include "mysqlnd_priv.h" #include "mysqlnd_result.h" diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_vio.c index e2c125fdfb..e2c125fdfb 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_vio.c diff --git a/ext/mysqlnd/mysqlnd_net.h b/ext/mysqlnd/mysqlnd_vio.h index 3c7e3cb6a1..3c7e3cb6a1 100644 --- a/ext/mysqlnd/mysqlnd_net.h +++ b/ext/mysqlnd/mysqlnd_vio.h diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index e15a351cf2..15cc02f95e 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -23,8 +23,6 @@ #ifndef MYSQLND_WIREPROTOCOL_H #define MYSQLND_WIREPROTOCOL_H -#include "mysqlnd_net.h" - #define MYSQLND_HEADER_SIZE 4 #define COMPRESSED_HEADER_SIZE 3 |