diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /include/hash.h | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'include/hash.h')
| -rw-r--r-- | include/hash.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/hash.h b/include/hash.h index 515c764214d..7b4ec1b4685 100644 --- a/include/hash.h +++ b/include/hash.h @@ -17,6 +17,21 @@ #ifndef _hash_h #define _hash_h + +#include "my_global.h" /* uchar */ +#include "my_sys.h" /* DYNAMIC_ARRAY */ + +/* + This forward declaration is used from C files where the real + definition is included before. Since C does not allow repeated + 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 |