diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-04 23:17:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-04 23:17:45 +0300 |
| commit | c98248649d723835660ea5703e7058ce1a6202f3 (patch) | |
| tree | 46e23cd2170be042ecb871f07ed5a09b011d2d09 /innobase | |
| parent | fb339587a53a1b7cd9385e24c36e82eb278c51d8 (diff) | |
| parent | b5860aed7b1d11f2d3ac909cde1438c86af26cb5 (diff) | |
| download | mariadb-git-c98248649d723835660ea5703e7058ce1a6202f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/univ.i | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index e29f3ec92e1..4854e5a7b78 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -187,7 +187,11 @@ management to ensure correct alignment for doubles etc. */ /* Another basic type we use is unsigned long integer which is intended to be equal to the word size of the machine. */ +#ifdef _WIN64 +typedef unsigned __int64 ulint; +#else typedef unsigned long int ulint; +#endif typedef long int lint; |