From 367458469b832d2cf0adfcebae850b06486b2f28 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:12:38 +0100 Subject: [PATCH] Xplatform changes --- include/hasp_conf.h | 46 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/include/hasp_conf.h b/include/hasp_conf.h index c0e2f847..215c673d 100644 --- a/include/hasp_conf.h +++ b/include/hasp_conf.h @@ -222,36 +222,34 @@ static WiFiSpiClass WiFi; #include "svc/hasp_slave.h" #endif -#ifndef FPSTR - #define FPSTR(pstr_pointer) (reinterpret_cast(pstr_pointer)) -#endif +#ifdef WINDOWS + #ifndef FPSTR + #define FPSTR(pstr_pointer) (reinterpret_cast(pstr_pointer)) + #endif -#ifndef PGM_P - #define PGM_P const char * -#endif + #ifndef __FlashStringHelper + #define __FlashStringHelper char + #endif -#ifndef __FlashStringHelper - #define __FlashStringHelper char -#endif + #ifndef FPSTR + #define FPSTR(pstr_pointer) (reinterpret_cast(pstr_pointer)) + #endif -#ifndef FPSTR - #define FPSTR(pstr_pointer) (reinterpret_cast(pstr_pointer)) -#endif + #ifndef PGM_P + #define PGM_P const char * + #endif -#ifndef PGM_P - #define PGM_P const char * -#endif + #ifndef F + #define F(x) (x) + #endif -#ifndef F - #define F(x) (x) -#endif + #ifndef PSTR + #define PSTR(x) x + #endif -#ifndef PSTR - #define PSTR(x) x -#endif - -#ifndef PROGMEM - #define PROGMEM + #ifndef PROGMEM + #define PROGMEM + #endif #endif #ifdef WINDOWS