edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8915 from Robyt3/Base-Detect-ARM-Redefinition-Fix

Browse source 
Fix redefinition of `CONF_ARCH_STRING` for ARM architectures
This commit is contained in:
Dennis Felsing 2024-09-07 21:03:40 +00:00 committed by GitHub
parent a865354320 8e45d0a71a
commit 337d5c7ab3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/base/detect.h
View file

@ -163,19 +163,19 @@
#define CONF_ARCH_ARM 1 #define CONF_ARCH_ARM 1
#define CONF_ARCH_STRING "arm" #define CONF_ARCH_STRING "arm"
#define CONF_ARCH_ENDIAN_BIG 1 #define CONF_ARCH_ENDIAN_BIG 1
#endif #elif defined(__ARMEL__)
#if defined(__ARMEL__)
#define CONF_ARCH_ARM 1 #define CONF_ARCH_ARM 1
#define CONF_ARCH_STRING "arm" #define CONF_ARCH_STRING "arm"
#define CONF_ARCH_ENDIAN_LITTLE 1 #define CONF_ARCH_ENDIAN_LITTLE 1
#endif #elif defined(__aarch64__) || defined(__arm64__) || defined(__ARM_ARCH_ISA_A64)
#if defined(__aarch64__) || defined(__arm64__) || defined(__ARM_ARCH)
#define CONF_ARCH_ARM64 1 #define CONF_ARCH_ARM64 1
#define CONF_ARCH_STRING "arm64" #define CONF_ARCH_STRING "arm64"
#if defined(__ARM_BIG_ENDIAN)
#define CONF_ARCH_ENDIAN_BIG 1
#else
#define CONF_ARCH_ENDIAN_LITTLE 1 #define CONF_ARCH_ENDIAN_LITTLE 1
#endif #endif
#endif
#ifndef CONF_FAMILY_STRING #ifndef CONF_FAMILY_STRING
#define CONF_FAMILY_STRING "unknown" #define CONF_FAMILY_STRING "unknown"