diff options
Diffstat (limited to 'storage/innobase/include/mach0data.h')
| -rw-r--r-- | storage/innobase/include/mach0data.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h index 8434bc73586..3066070ef39 100644 --- a/storage/innobase/include/mach0data.h +++ b/storage/innobase/include/mach0data.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -27,6 +27,8 @@ Created 11/28/1995 Heikki Tuuri #ifndef mach0data_h #define mach0data_h +#ifndef UNIV_INNOCHECKSUM + #include "univ.i" #include "ut0byte.h" @@ -204,7 +206,7 @@ UNIV_INLINE void mach_write_to_8( /*============*/ - byte* b, /*!< in: pointer to 8 bytes where to store */ + void* b, /*!< in: pointer to 8 bytes where to store */ ib_uint64_t n); /*!< in: 64-bit integer to be stored */ /********************************************************//** The following function is used to fetch data from 8 consecutive @@ -361,19 +363,19 @@ mach_write_to_2_little_endian( /*==========================*/ byte* dest, /*!< in: where to write */ ulint n); /*!< in: unsigned long int to write */ - /*********************************************************//** Convert integral type from storage byte order (big endian) to host byte order. @return integer value */ UNIV_INLINE -ullint +ib_uint64_t mach_read_int_type( /*===============*/ const byte* src, /*!< in: where to read from */ ulint len, /*!< in: length of src */ ibool unsigned_type); /*!< in: signed or unsigned flag */ #endif /* !UNIV_HOTBACKUP */ +#endif /* !UNIV_INNOCHECKSUM */ #ifndef UNIV_NONINL #include "mach0data.ic" |