tweak alloca.h

lovyan03 · May 20, 2024 · a623d49 · a623d49
1 parent d6c6e88
commit a623d49
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 37 deletions.
diff --git a/src/lgfx/internal/alloca.h b/src/lgfx/internal/alloca.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#if __has_include(<alloca.h>)
+#include <alloca.h>
+#else
+#include <stdlib.h>
+#include <malloc.h>
+#ifndef alloca
+#define alloca _alloca
+#endif
+#endif
diff --git a/src/lgfx/utility/lgfx_qrcode.c b/src/lgfx/utility/lgfx_qrcode.c
@@ -40,12 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if __has_include(<alloca.h>)
-#include <alloca.h>
-#elif !defined(alloca)
-#include <malloc.h>
-#define alloca _alloca
-#endif
+#include "../internal/alloca.h"
 
 #ifdef max
 #undef max

diff --git a/src/lgfx/v0/LGFXBase.cpp b/src/lgfx/v0/LGFXBase.cpp
@@ -28,6 +28,7 @@ Original Source:
 #include "../utility/lgfx_pngle.h"    // PNG decode support
 #include "../utility/lgfx_qrcode.h"   // QR code support
 #include "../utility/lgfx_miniz.h"
+#include "../internal/alloca.h"
 
 #include <algorithm>
 #include <math.h>
@@ -37,13 +38,6 @@ Original Source:
 #include <list>
 #include <string>
 
-#if __has_include(<alloca.h>)
-#include <alloca.h>
-#else
-#include <malloc.h>
-#define alloca _alloca
-#endif
-
 extern "C" {
   #pragma GCC diagnostic ignored "-Wshadow"
   #pragma GCC diagnostic ignored "-Wdouble-promotion"

diff --git a/src/lgfx/v1/Panel.hpp b/src/lgfx/v1/Panel.hpp
@@ -19,15 +19,7 @@ Original Source:
 
 #include <stdint.h>
 
-#if __has_include("alloca.h")
-#include <alloca.h>
-#else
-#include <malloc.h>
-#ifndef alloca
-#define alloca _alloca
-#endif
-#endif
-
+#include "../internal/alloca.h"
 #include "misc/enum.hpp"
 #include "misc/colortype.hpp"
 #include "misc/pixelcopy.hpp"

diff --git a/src/lgfx/v1/lgfx_filesystem_support.hpp b/src/lgfx/v1/lgfx_filesystem_support.hpp
@@ -27,14 +27,7 @@ Original Source:
 #include <math.h>
 #include <string.h>
 
-#if __has_include("alloca.h")
- #include <alloca.h>
-#else
- #include <malloc.h>
- #ifndef alloca
- #define alloca _alloca
- #endif
-#endif
+#include "../internal/alloca.h"
 
 namespace lgfx
 {

diff --git a/src/lgfx/v1/panel/Panel_M5HDMI.cpp b/src/lgfx/v1/panel/Panel_M5HDMI.cpp
@@ -24,6 +24,7 @@ Original Source:
 #include "../platforms/common.hpp"
 #include "../misc/pixelcopy.hpp"
 #include "../misc/colortype.hpp"
+#include "../../internal/alloca.h"
 
 #include <stdint.h>
 #include <stddef.h>
@@ -35,13 +36,6 @@ Original Source:
  #include <hal/gpio_types.h>
 #endif
 
-#if __has_include(<alloca.h>)
-#include <alloca.h>
-#else
-#include <malloc.h>
-#define alloca _alloca
-#endif
-
 #define TAG "M5HDMI"
 
 namespace lgfx