diff options
| author | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
| commit | 9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3 (patch) | |
| tree | 0a41aa330429f40b1c6866922006bfb0cb59b1ef /include/my_global.h | |
| parent | d3d56609520700ce6f0490007cd4c01870bc7fd6 (diff) | |
| parent | 21eed96b0261a6c6eff4f8df1493a0e57decf2bb (diff) | |
| download | mariadb-git-9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 0353dc91fcf..55ec427e3e1 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -414,6 +414,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 |