diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-07-05 18:20:46 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-07-05 18:20:46 +0200 |
| commit | b8f24eedf5bf909c36b98c5227066703e0f3526a (patch) | |
| tree | 6404d2c4b5d4ba2ee0ef31bcc81cace43bf21ef7 /include | |
| parent | 9f483f1a3d57c7f9815dfbe49a10c2cf0043c943 (diff) | |
| download | mariadb-git-b8f24eedf5bf909c36b98c5227066703e0f3526a.tar.gz | |
Backport changeset from mysql-next-mr-bugfixing:
3245 Vladislav Vaintroub 2010-06-16
Bug #52959 uint in typedef.h undefined on Windows
Fix: change uint to "unsigned int"
Diffstat (limited to 'include')
| -rw-r--r-- | include/typelib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/typelib.h b/include/typelib.h index c6a7f7a42e9..3badb14c96e 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -36,9 +36,9 @@ extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from); extern TYPELIB sql_protocol_typelib; -my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name, +my_ulonglong find_set_from_flags(const TYPELIB *lib, unsigned int default_name, my_ulonglong cur_set, my_ulonglong default_set, - const char *str, uint length, - char **err_pos, uint *err_len); + const char *str, unsigned int length, + char **err_pos, unsigned int *err_len); #endif /* _typelib_h */ |