stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-13 13:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'endianess' of github.com:AMDmi3/SRB2

Browse source
This commit is contained in:
Alam Ed Arias 2014-05-02 08:49:00 -04:00
commit 00fc6b9dcd
3 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/endian.h Normal file
View file

@ -0,0 +1,45 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2014 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file endian.h
/// \brief Endian detection
#ifndef __ENDIAN__
#define __ENDIAN__
#if defined(SRB2_BIG_ENDIAN) || defined(SRB2_LITTLE_ENDIAN)
// defined externally
#else
#if defined(__FreeBSD__)
// on FreeBSD, _BIG_ENDIAN is a constant to compare
// _BYTE_ORDER to, not a big-endianess flag
#include <sys/endian.h>
#if _BYTE_ORDER == _BIG_ENDIAN
#define SRB2_BIG_ENDIAN
#else
#define SRB2_LITTLE_ENDIAN
#endif
#elif defined(__BYTE_ORDER__)
// defined by at least gcc and clang
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define SRB2_BIG_ENDIAN
#else
#define SRB2_LITTLE_ENDIAN
#endif
#else
// check used in vanilla SRB2 (may work incorrectly if
// _BIG_ENDIAN is used as on FreeBSD)
#if defined(_BIG_ENDIAN)
#define SRB2_BIG_ENDIAN
#else
#define SRB2_LITTLE_ENDIAN
#endif
#endif
#endif
#endif //__ENDIAN__

4
src/m_swap.h
View file

@ -14,9 +14,11 @@
#ifndef __M_SWAP__ #ifndef __M_SWAP__
#define __M_SWAP__ #define __M_SWAP__
#include "endian.h"
// Endianess handling. // Endianess handling.
// WAD files are stored little endian. // WAD files are stored little endian.
#ifdef _BIG_ENDIAN #ifdef SRB2_BIG_ENDIAN
#define SHORT(x) ((INT16)(\ #define SHORT(x) ((INT16)(\
(((UINT16)(x) & (UINT16)0x00ffU) << 8) \ (((UINT16)(x) & (UINT16)0x00ffU) << 8) \

9
src/md5.c
View file

@ -44,14 +44,9 @@
#include "md5.h" #include "md5.h"
#ifdef _LIBC #include "endian.h"
#include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN
#define WORDS_BIGENDIAN 1
#endif
#endif
#if defined (WORDS_BIGENDIAN) || defined (_BIG_ENDIAN) #if defined (SRB2_BIG_ENDIAN)
#define SWAP(n) \ #define SWAP(n) \
(((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
#else #else