PHP mysqlnd svn commit: r114 - trunk/ext/mysqli/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-03-13 11:34:47 +0100 (Tue, 13 Mar 2007)
New Revision: 114

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
Log:
IS_UNICODE is not part of PHP5, thus compile it only with PHP6


Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-13 10:00:28 UTC (rev 113)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-13 10:34:47 UTC (rev 114)
@@ -580,7 +580,12 @@
 					if (IS_NULL != (Z_TYPE_P(stmt->result_bind[i].zv) = Z_TYPE_P(data)) ) {
 						stmt->result_bind[i].zv->value = data->value;
 
-						if ((Z_TYPE_P(data) == IS_STRING || Z_TYPE_P(data) == IS_UNICODE)
+						if (
+							(Z_TYPE_P(data) == IS_STRING
+#if PHP_MAJOR_VERSION >= 6
+							|| Z_TYPE_P(data) == IS_UNICODE
+#endif
+							)
 							 && (result->fields[i].max_length < Z_STRLEN_P(data)))
 						{
 							result->fields[i].max_length = Z_STRLEN_P(data);