summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_structs.h
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2014-05-20 19:57:11 +0300
committerAndrey Hristov <andrey@php.net>2014-05-20 19:57:11 +0300
commit5d57e17a15cf89bf8b20d718ce5070b42ee446e0 (patch)
tree63ffe65e89412e6e37e267d3889a28d0823d3672 /ext/mysqlnd/mysqlnd_structs.h
parent2312af04a7ca7a43166a7a1be20067e632ff917a (diff)
downloadphp-git-5d57e17a15cf89bf8b20d718ce5070b42ee446e0.tar.gz
First set of phpng changes for mysqlnd
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
-rw-r--r--ext/mysqlnd/mysqlnd_structs.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 66920e47be..a72fccf88f 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -149,12 +149,10 @@ typedef struct st_mysqlnd_charset
/* local infile handler */
typedef struct st_mysqlnd_infile
{
- int (*local_infile_init)(void **ptr, char *filename, void **userdata TSRMLS_DC);
+ int (*local_infile_init)(void **ptr, const char * const filename TSRMLS_DC);
int (*local_infile_read)(void *ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC);
- int (*local_infile_error)(void *ptr, char *error_msg, unsigned int error_msg_len TSRMLS_DC);
+ int (*local_infile_error)(void *ptr, char * error_msg, unsigned int error_msg_len TSRMLS_DC);
void (*local_infile_end)(void *ptr TSRMLS_DC);
- zval *callback;
- void *userdata;
} MYSQLND_INFILE;
typedef struct st_mysqlnd_options