← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/mach0data.ic

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/mach0data.ic
75
75
to the canonical format, for fast bytewise equality test
76
76
against memory. */
77
77
UNIV_INLINE
78
 
uint16
 
78
uint16_t
79
79
mach_encode_2(
80
80
/*==========*/
81
81
                        /* out: 16-bit integer in canonical format */
82
82
        ulint   n)      /* in: integer in machine-dependent format */
83
83
{
84
 
        uint16  ret;
 
84
        uint16_t        ret;
85
85
        ut_ad(2 == sizeof ret);
86
86
        mach_write_to_2((byte*) &ret, n);
87
87
        return(ret);
95
95
mach_decode_2(
96
96
/*==========*/
97
97
                        /* out: integer in machine-dependent format */
98
 
        uint16  n)      /* in: 16-bit integer in canonical format */
 
98
        uint16_t        n)      /* in: 16-bit integer in canonical format */
99
99
{
100
100
        ut_ad(2 == sizeof n);
101
101
        return(mach_read_from_2((byte*) &n));