georg Tue Jul 12 11:45:12 2005 EDT
Modified files:
/php-src/ext/mysqli php_mysqli.h mysqli_nonapi.c
Log:
changed version dependency for charset functions
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.51
php-src/ext/mysqli/php_mysqli.h:1.52
--- php-src/ext/mysqli/php_mysqli.h:1.51 Tue Jul 12 05:35:16 2005
+++ php-src/ext/mysqli/php_mysqli.h Tue Jul 12 11:45:07 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.51 2005/07/12 09:35:16 georg Exp $
+ $Id: php_mysqli.h,v 1.52 2005/07/12 15:45:07 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -29,6 +29,10 @@
/* character set support */
#if MYSQL_VERSION_ID > 50009
+#define HAVE_MYSQLI_GET_CHARSET
+#endif
+
+#if (MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID
> 50005
#define HAVE_MYSQLI_SET_CHARSET
#endif
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.49&r2=1.50&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.49
php-src/ext/mysqli/mysqli_nonapi.c:1.50
--- php-src/ext/mysqli/mysqli_nonapi.c:1.49 Tue Jul 12 05:35:16 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jul 12 11:45:07 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.49 2005/07/12 09:35:16 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.50 2005/07/12 15:45:07 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -323,6 +323,7 @@
/* }}} */
#endif
+#ifdef HAVE_MYSQLI_GET_CHARSET
/* {{{ object mysqli_get_charset(object link)
returns a character set object */
PHP_FUNCTION(mysqli_get_charset)
@@ -350,6 +351,7 @@
add_property_long(return_value, "state", cs.state);
}
/* }}} */
+#endif
/*
* Local variables:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
