diff options
| author | Wez Furlong <wez@php.net> | 2004-05-19 12:40:11 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-05-19 12:40:11 +0000 |
| commit | 8759648192a6854a80f2bd6344ce5d00fe32c3da (patch) | |
| tree | 6306d4720e9f7e41085462159b7dbe4800c21c63 | |
| parent | 4116d9fb0e310dc8f888a1d47e78c659451272cd (diff) | |
| download | php-git-8759648192a6854a80f2bd6344ce5d00fe32c3da.tar.gz | |
Update prepare() prototype.
Attempt to hunt down the cause of a build warning under win32 by adjust the
name of the error function.
| -rwxr-xr-x | ext/pdo_mysql/CREDITS | 2 | ||||
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 4 | ||||
| -rwxr-xr-x | ext/pdo_mysql/php_pdo_mysql_int.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ext/pdo_mysql/CREDITS b/ext/pdo_mysql/CREDITS new file mode 100755 index 0000000000..0735d9a1e8 --- /dev/null +++ b/ext/pdo_mysql/CREDITS @@ -0,0 +1,2 @@ +mySQL 3.x driver for PDO +George Schlossnagle diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index e217654933..948ee5e7d7 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -30,7 +30,7 @@ #include "php_pdo_mysql.h" #include "php_pdo_mysql_int.h" -int _mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC) /* {{{ */ +int _pdo_mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC) /* {{{ */ { switch (errno) { default: @@ -59,7 +59,7 @@ static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */ } /* }}} */ -static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt TSRMLS_DC) +static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt, long options, zval *driver_options TSRMLS_DC) { pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data; pdo_mysql_stmt *S = ecalloc(1, sizeof(pdo_mysql_stmt)); diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 057089832d..f66eb3cdf0 100755 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -26,7 +26,7 @@ /* stuff we use in a mySQL database handle */ typedef struct { MYSQL *server; - unsigned int last_err; + int last_err; unsigned attached:1; unsigned _reserved:31; } pdo_mysql_db_handle; @@ -53,8 +53,8 @@ typedef struct { extern pdo_driver_t pdo_mysql_driver; -extern int _mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC); -#define pdo_mysql_error(w,s) _mysql_error(w, s, __FILE__, __LINE__ TSRMLS_CC) +extern int _pdo_mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC); +#define pdo_mysql_error(w,s) _pdo_mysql_error(w, s, __FILE__, __LINE__ TSRMLS_CC) extern int mysql_handle_error(pdo_dbh_t *dbh, pdo_mysql_db_handle *H, int errcode); extern struct pdo_stmt_methods mysql_stmt_methods; |