From: Georg Richter <georg@php.net>
Date: Fri, 13 May 2005 13:30:22 +0000 (+0000)
Subject: mysql_set_charset now works version undependent for MySQL 4.1.13 and above
X-Git-Tag: php-5.0.1b1~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8f91dc44c6d258be8fe38e76530dbf4509c30a2;p=php

mysql_set_charset now works version undependent for MySQL 4.1.13 and above
---

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index ef420351a9..3d2cdffb73 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -99,16 +99,14 @@ typedef struct {
 
 #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