andrey Tue Jul 24 09:22:16 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli_api.c
Log:
Fix build with latest 5.1 sources where gptr is no more.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.13&r2=1.118.2.22.2.14&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.13
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.14
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.13 Thu Jun 28 09:07:40 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Jul 24 09:22:16 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.13 2007/06/28 09:07:40 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.14 2007/07/24 09:22:16 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -141,13 +141,13 @@
switch (types[ofs]) {
case 'd': /* Double */
bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
- bind[ofs].buffer = (gptr)&Z_DVAL_PP(args[i]);
+ bind[ofs].buffer = (char*)&Z_DVAL_PP(args[i]);
bind[ofs].is_null = &stmt->param.is_null[ofs];
break;
case 'i': /* Integer */
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
- bind[ofs].buffer = (gptr)&Z_LVAL_PP(args[i]);
+ bind[ofs].buffer = (char*)&Z_LVAL_PP(args[i]);
bind[ofs].is_null = &stmt->param.is_null[ofs];
break;
@@ -600,11 +600,11 @@
break;
case MYSQL_TYPE_DOUBLE:
convert_to_double_ex(&stmt->param.vars[i]);
- stmt->stmt->params[i].buffer =
(gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
+ stmt->stmt->params[i].buffer =
(char*)&Z_LVAL_PP(&stmt->param.vars[i]);
break;
case MYSQL_TYPE_LONG:
convert_to_long_ex(&stmt->param.vars[i]);
- stmt->stmt->params[i].buffer =
(gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
+ stmt->stmt->params[i].buffer =
(char*)&Z_LVAL_PP(&stmt->param.vars[i]);
break;
default:
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php