summaryrefslogtreecommitdiff
path: root/include/hash.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
committerSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
commit0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
treebdf0738c29dc1f57fbfba3a1754524e238f15b52 /include/hash.h
parent37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
downloadmariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz
lots of post-merge changes
Diffstat (limited to 'include/hash.h')
-rw-r--r--include/hash.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/hash.h b/include/hash.h
index f3d9d82f187..ae3f017a03e 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -27,11 +27,6 @@
typedef declarations, even when identical, the definition may not be
repeated.
*/
-#ifndef CHARSET_INFO_DEFINED
-#define CHARSET_INFO_DEFINED
-typedef struct charset_info_st CHARSET_INFO;
-#endif /* CHARSET_INFO_DEFINED */
-
#ifdef __cplusplus
extern "C" {
#endif