diff options
| author | unknown <monty@mysql.com> | 2005-04-30 09:46:08 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-30 09:46:08 +0300 |
| commit | a6acc4462c9e9e3c5216a2092b9560eb9b15c84c (patch) | |
| tree | e80b3783a194721c482640efffd48d32ad224e5f /include/my_global.h | |
| parent | e64d221e69ebaedd80115d6892838544ab9407fd (diff) | |
| parent | 3b6043870d5764add22078f3785c059fe760e7f7 (diff) | |
| download | mariadb-git-a6acc4462c9e9e3c5216a2092b9560eb9b15c84c.tar.gz | |
Merge with 4.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
mysql-test/r/cast.result:
Merge
mysql-test/t/cast.test:
Merge
sql/sql_insert.cc:
Merge
sql/sql_select.cc:
Merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 74846fe1762..e816d52cc71 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -425,6 +425,8 @@ int __void__; #endif #if defined(__EMX__) || !defined(HAVE_UINT) +#undef HAVE_UINT +#define HAVE_UINT typedef unsigned int uint; typedef unsigned short ushort; #endif |