0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix sq/min/max macros after platform headers

Browse source
This commit is contained in:
Scott Lahteine 2017-11-19 14:01:05 -06:00
parent fe4f009fdd
commit 8836623e0f
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/HAL/HAL_LPC1768/HAL.h
View file

@ -35,6 +35,10 @@
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
#undef min
#undef max
#include <algorithm> #include <algorithm>
void _printf (const char *format, ...); void _printf (const char *format, ...);
@ -52,7 +56,8 @@ extern "C" volatile uint32_t _millis;
#define B01 1 #define B01 1
#define B10 2 #define B10 2
#include "arduino.h" #include "include/arduino.h"
#include "pinmapping.h" #include "pinmapping.h"
#include "fastio.h" #include "fastio.h"
#include "watchdog.h" #include "watchdog.h"

4
Marlin/src/HAL/HAL_TEENSY35_36/HAL_Teensy.h
View file

@ -32,6 +32,10 @@
#include <Arduino.h> #include <Arduino.h>
// Redefine sq macro defined by teensy3/wiring.h
#undef sq
#define sq(x) ((x)*(x))
#include "fastio_Teensy.h" #include "fastio_Teensy.h"
#include "watchdog_Teensy.h" #include "watchdog_Teensy.h"