~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/univ.i

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
216
216
typedef longlong                ib_longlong;
217
217
#endif
218
218
 
219
 
typedef unsigned long long int  ullint;
 
219
typedef uint64_t        ullint;
220
220
 
221
221
#ifndef __WIN__
222
222
#if SIZEOF_LONG != SIZEOF_VOIDP