--- truecrypt/common/endian.h 2018/04/24 16:48:28 1.1.1.12 +++ truecrypt/common/endian.h 2018/04/24 16:53:51 1.1.1.14 @@ -5,7 +5,7 @@ Agreement for Encryption for the Masses'. Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2003-2008 TrueCrypt Foundation and are governed - by the TrueCrypt License 2.4 the full text of which is contained in the + by the TrueCrypt License 2.5 the full text of which is contained in the file License.txt included in TrueCrypt binary and source code distribution packages. */ @@ -28,47 +28,28 @@ extern "C" #elif !defined(BYTE_ORDER) -# ifdef LINUX_DRIVER -# include - -# define LITTLE_ENDIAN 1234 -# define BIG_ENDIAN 4321 - -# ifdef __LITTLE_ENDIAN -# define BYTE_ORDER LITTLE_ENDIAN -# endif - -# ifdef __BIG_ENDIAN -# define BYTE_ORDER BIG_ENDIAN -# endif - -# ifndef BYTE_ORDER -# error Byte order cannot be determined - kernel source not prepared for building of modules -# endif +# ifdef TC_MACOSX +# include +# elif defined (TC_BSD) +# include # else -# ifdef TC_MACOSX -# include -# elif defined (TC_BSD) -# include -# else -# include -# endif - -# ifndef BYTE_ORDER -# ifndef __BYTE_ORDER -# error Byte order cannot be determined (BYTE_ORDER undefined) -# endif +# include +# endif -# define BYTE_ORDER __BYTE_ORDER +# ifndef BYTE_ORDER +# ifndef __BYTE_ORDER +# error Byte order cannot be determined (BYTE_ORDER undefined) # endif -# ifndef LITTLE_ENDIAN -# define LITTLE_ENDIAN __LITTLE_ENDIAN -# endif +# define BYTE_ORDER __BYTE_ORDER +# endif -# ifndef BIG_ENDIAN -# define BIG_ENDIAN __BIG_ENDIAN -# endif +# ifndef LITTLE_ENDIAN +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# endif + +# ifndef BIG_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN # endif #endif // !BYTE_ORDER