PokittoLib is the library needed for programming the Pokitto DIY game console (www.pokitto.com)
Diff: POKITTO_CORE/PokittoDisplay.cpp
- Revision:
- 42:798b5d67b372
- Parent:
- 35:4f7edccf8ed6
diff -r e667167aa9d8 -r 798b5d67b372 POKITTO_CORE/PokittoDisplay.cpp --- a/POKITTO_CORE/PokittoDisplay.cpp Wed Apr 25 14:00:49 2018 +0000 +++ b/POKITTO_CORE/PokittoDisplay.cpp Tue May 01 18:42:46 2018 +0000 @@ -71,6 +71,11 @@ #include "PokittoSound.h" #include <stdio.h> #include <string.h> +#ifdef DISABLEAVRMIN +#include <algorithm> +using std::min; +using std::max; +#endif // DISABLEAVRMIN #ifndef POK_SIM #include "HWLCD.h" @@ -78,9 +83,9 @@ #include "SimLCD.h" #endif -//extern "C" void CheckStack(); -//extern char _ebss[]; // In map file -//extern char _vStackTop[]; // In map file +extern "C" void CheckStack(); +extern char _ebss[]; // In map file +extern char _vStackTop[]; // In map file Pokitto::Core core; Pokitto::Sound _pdsound; @@ -2521,8 +2526,9 @@ } // Check the stack size and show a crash screen if the stack is too big. -/*void CheckStack() { +void CheckStack() { #ifndef POK_SIM + #ifndef __ARMCC_VERSION int currStackTop; const int freeStackThreshold = 400; if ((int)&currStackTop - (int)_ebss < freeStackThreshold) { @@ -2549,10 +2555,10 @@ ShowCrashScreenAndWait(texLine1, texLine2, texLine3, texLine4, infoString); } #endif -}*/ + #endif +} /** Eof */ -