From a2fbc452ca7cf9c5839e009ce111552f8db38e89 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 15 Feb 2021 03:02:32 +0300
Subject: [PATCH] replace i386 checks with __i386__
---
include/SDL_stdinc.h | 2 +-
src/stdlib/SDL_malloc.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
index d0634b980..c3a03b2d3 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -468,7 +468,7 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords)
{
#ifdef __APPLE__
memset_pattern4(dst, &val, dwords * 4);
-#elif defined(__GNUC__) && defined(i386)
+#elif defined(__GNUC__) && defined(__i386__)
int u0, u1, u2;
__asm__ __volatile__ (
"cld \n\t"
diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c
index 39c863ee3..53af5182e 100644
--- a/src/stdlib/SDL_malloc.c
+++ b/src/stdlib/SDL_malloc.c
@@ -485,6 +485,7 @@ DEFAULT_MMAP_THRESHOLD default: 256K
#define WIN32 1
#endif /* _WIN32 */
#endif /* WIN32 */
+
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -2326,7 +2327,7 @@ static size_t traverse_and_check(mstate m);
#define treebin_at(M,i) (&((M)->treebins[i]))
/* assign tree index for size S to variable I */
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && defined(__i386__)
#define compute_tree_index(S, I)\
{\
size_t X = S >> TREEBIN_SHIFT;\
@@ -2391,7 +2392,7 @@ static size_t traverse_and_check(mstate m);
/* index corresponding to given bit */
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && defined(__i386__)
#define compute_bit2idx(X, I)\
{\
unsigned int J;\