X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fprivate.h;h=787a3ad325282a5bf61ec7301c4d2486ab33473b;hb=c5dc3750efbc615b70917f19bb95cbd352cd00f6;hp=44962a1dd54b61e7bca602c7d48ef37aeb9b3d5c;hpb=44146d06c780d3aaa283672fedb08b8870ebe1b9;p=lugaru.git diff --git a/Source/private.h b/Source/private.h index 44962a1..787a3ad 100644 --- a/Source/private.h +++ b/Source/private.h @@ -1,22 +1,21 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. -Lugaru 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 Foundation; either version 2 -of the License, or (at your option) any later version. +Lugaru 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 Foundation; either version 2 of the License, or +(at your option) any later version. -This program is distributed in the hope that it will be useful, +Lugaru is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. +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. +along with Lugaru. If not, see . */ #ifndef private_h @@ -49,9 +48,9 @@ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned long uint32_t; #ifdef WIN32 - typedef unsigned __int64 uint64_t; +typedef unsigned __int64 uint64_t; #else - typedef unsigned long long uint64_t; +typedef unsigned long long uint64_t; #endif typedef float float32_t; typedef double float64_t; @@ -107,15 +106,12 @@ BinIO_INLINE void BinIOSwap8(const uint8_t *src, uint8_t *dst) BinIO_INLINE int BinIONormalizeByteOrder(int byte_order) { - if (byte_order == BinIO_HOST_BYTE_ORDER) - { + if (byte_order == BinIO_HOST_BYTE_ORDER) { byte_order = BinIO_BYTE_ORDER; - } - else if (byte_order == BinIO_NETWORK_BYTE_ORDER) - { + } else if (byte_order == BinIO_NETWORK_BYTE_ORDER) { byte_order = BinIO_BIG_ENDIAN_BYTE_ORDER; } - + return byte_order; } @@ -132,8 +128,7 @@ extern void BinIOConvert8(int from_byte_order, int to_byte_order, const uint8_t *src, uint8_t *dst, unsigned int count); -struct BinIOFormatCursor -{ +struct BinIOFormatCursor { const char *cursor; int byte_order; int count;