cvs: php-src /ext/mysqli mysqli_nonapi.c
| From: | Ilia Alshanetsky | Date: | Sat, 07 Oct 2006 18:24:51 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_nonapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40987@lists.php.net to get a copy of this message | ||
iliaa Sat Oct 7 18:24:51 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Another build fix
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.65&r2=1.66&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.65 php-src/ext/mysqli/mysqli_nonapi.c:1.66
--- php-src/ext/mysqli/mysqli_nonapi.c:1.65 Mon Oct 2 07:42:49 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Oct 7 18:24:51 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.65 2006/10/02 07:42:49 bjori Exp $
+ $Id: mysqli_nonapi.c,v 1.66 2006/10/07 18:24:51 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -93,11 +93,13 @@
RETURN_FALSE;
}
+#ifdef HAVE_MYSQLI_SET_CHARSET
/* when PHP runs in unicode, set default character set to utf8 */
if (UG(unicode)) {
mysql_set_character_set(mysql->mysql, "utf8");
mysql->conv = UG(utf8_conv);
}
+#endif
/* clear error */
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)
TSRMLS_CC);