RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-12-31 04:39:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #731 from RfidResearchGroup/test_fix_730

Browse source 
Fix 2 issues in proxendian.h, see details:
This commit is contained in:
Philippe Teuwen 2020-05-13 02:25:22 +02:00 committed by GitHub
commit 435b2b2632
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.defs
View file

@ -51,8 +51,6 @@ DEFCFLAGS += -Wbad-function-cast -Wredundant-decls -Wmissing-prototypes -Wchar-s
# Some more warnings we need first to eliminate, so temporarely tolerated:
DEFCFLAGS += -Wcast-align -Wno-error=cast-align
DEFCFLAGS += -Wswitch-enum -Wno-error=switch-enum
# Termux on-device __BYTE_ORDER and __LITTLE_ENDIAN undef in src/proxendian.h, see #730
DEFCFLAGS += -Wno-error=undef
ifeq ($(platform),Darwin)
# their readline has strict-prototype issues

27
client/src/proxendian.h
View file

@ -16,17 +16,22 @@
#ifdef _WIN32
# define HOST_LITTLE_ENDIAN
#else
# include <sys/types.h>
# ifndef BYTE_ORDER
# define BYTE_ORDER __BYTE_ORDER
# define LITTLE_ENDIAN __LITTLE_ENDIAN
# define BIG_ENDIAN __BIG_ENDIAN
# endif
# if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
# error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
# endif
# if BYTE_ORDER == LITTLE_ENDIAN
# define HOST_LITTLE_ENDIAN
// Only some OSes include endian.h from sys/types.h, not Termux, so let's include endian.h directly
# include <endian.h>
# if !defined(BYTE_ORDER)
# if !defined(__BYTE_ORDER) || (__BYTE_ORDER != __LITTLE_ENDIAN && __BYTE_ORDER != __BIG_ENDIAN)
# error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
# endif
# if __BYTE_ORDER == __LITTLE_ENDIAN
# define HOST_LITTLE_ENDIAN
# endif
# else
# if BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN
# error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
# endif
# if BYTE_ORDER == LITTLE_ENDIAN
# define HOST_LITTLE_ENDIAN
# endif
# endif
#endif