georg Fri May 13 09:30:23 2005 EDT
Modified files:
/php-src/ext/mysqli php_mysqli.h
Log:
mysql_set_charset now works version undependent for MySQL 4.1.13 and above
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.46&r2=1.47&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.46
php-src/ext/mysqli/php_mysqli.h:1.47
--- php-src/ext/mysqli/php_mysqli.h:1.46 Fri May 13 09:11:40 2005
+++ php-src/ext/mysqli/php_mysqli.h Fri May 13 09:30:22 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.46 2005/05/13 13:11:40 georg Exp $
+ $Id: php_mysqli.h,v 1.47 2005/05/13 13:30:22 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -99,16 +99,14 @@
#ifdef PHP_WIN32
#define PHP_MYSQLI_API __declspec(dllexport)
-#if MYSQL_VERSION_ID > 50005
-#define HAVE_MYSQLI_SET_CHARSET
-#elif MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000
-#define HAVE_MYSQLI_SET_CHARSET
-#endif
#else
-#define HAVE_MYSQLI_SET_CHARSET
#define PHP_MYSQLI_API
#endif
+#if MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000
+#define HAVE_MYSQLI_SET_CHARSET
+#endif
+
#ifdef ZTS
#include "TSRM.h"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
