removed charset structure. libmysql now provides a function

mysqli_get_character_set_info (Vers. 5.0.10)

1 files changed, 6 insertions, 30 deletions

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 94dbd5dd81..d285eb10c8 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -26,6 +26,12 @@
 #endif
 
 #include <mysql.h>
+
+/* character set support */
+#if MYSQL_VERSION_ID > 50009
+#define HAVE_MYSQLI_SET_CHARSET
+#endif
+
 #include <errmsg.h>
 
 #ifndef PHP_MYSQLI_H
@@ -96,32 +102,6 @@ typedef struct {
 	void	*userdata;
 } mysqli_local_infile;
 
-typedef struct {
-  uint				number;
-  uint				primary_number;
-  uint				binary_number;
-  uint				state;
-  const char		*csname;
-  const char		*name;
-  const char		*comment;
-  const char		*tailoring;
-  unsigned char		*ctype;
-  unsigned char		*to_lower;
-  unsigned char		*to_upper;
-  unsigned char		*sort_order;
-  unsigned short	*contractions;
-  unsigned short	**sort_order_big;
-  unsigned short	*tab_to_uni;
-  void				*tab_from_uni;
-  unsigned char		*state_map;
-  unsigned char		*ident_map;
-  uint				strxfrm_multiply;
-  uint				mbminlen;
-  uint				mbmaxlen;
-  unsigned short	min_sort_char;
-  unsigned short	max_sort_char; /* For LIKE optimization */
-} CHARSET_INFO;
-
 #define phpext_mysqli_ptr &mysqli_module_entry
 
 #ifdef PHP_WIN32
@@ -130,10 +110,6 @@ typedef struct {
 #define PHP_MYSQLI_API
 #endif
 
-#if (MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID > 50005
-#define HAVE_MYSQLI_SET_CHARSET
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif