From 4037a68cccf9704297dabad67de7f41ed07ebe34 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Mon, 2 Dec 2019 15:03:43 +0100
Subject: [PATCH] typedef uint64_t lv_uintptr_t on 64 bit systems

---
 src/lv_misc/lv_mem.h   | 12 +-----------
 src/lv_misc/lv_types.h | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/lv_misc/lv_mem.h b/src/lv_misc/lv_mem.h
index d2c5f45d7..34ca3e9e9 100644
--- a/src/lv_misc/lv_mem.h
+++ b/src/lv_misc/lv_mem.h
@@ -22,21 +22,11 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 #include "lv_log.h"
+#include "lv_types.h"
 
 /*********************
  *      DEFINES
  *********************/
-// Check windows
-#ifdef __WIN64
-#define LV_MEM_ENV64
-#endif
-
-// Check GCC
-#ifdef __GNUC__
-#if defined(__x86_64__) || defined(__ppc64__)
-#define LV_MEM_ENV64
-#endif
-#endif
 
 /**********************
  *      TYPEDEFS
diff --git a/src/lv_misc/lv_types.h b/src/lv_misc/lv_types.h
index 89f04aa40..c588e2451 100644
--- a/src/lv_misc/lv_types.h
+++ b/src/lv_misc/lv_types.h
@@ -17,6 +17,17 @@ extern "C" {
 /*********************
  *      DEFINES
  *********************/
+// Check windows
+#ifdef __WIN64
+#define LV_ARCH_64
+#endif
+
+// Check GCC
+#ifdef __GNUC__
+#if defined(__x86_64__) || defined(__ppc64__)
+#define LV_ARCH_64
+#endif
+#endif
 
 /**********************
  *      TYPEDEFS
@@ -32,7 +43,11 @@ enum {
 };
 typedef uint8_t lv_res_t;
 
-typedef unsigned long int lv_uintptr_t;
+#ifdef LV_ARCH_64
+typedef uint64_t lv_uintptr_t;
+#else
+typedef uint32_t lv_uintptr_t;
+#endif
 
 /**********************
  * GLOBAL PROTOTYPES