File tree 1 file changed +11
-10
lines changed
1 file changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -121,16 +121,6 @@ typedef unsigned int word;
121
121
122
122
#ifdef __cplusplus
123
123
}
124
- #endif
125
-
126
- #ifndef _GLIBCXX_VECTOR
127
- // arduino is not compatible with std::vector
128
- #define min (a,b ) ((a)<(b)?(a):(b))
129
- #define max (a,b ) ((a)>(b)?(a):(b))
130
- #endif
131
-
132
- #define _min (a,b ) ((a)<(b)?(a):(b))
133
- #define _max (a,b ) ((a)>(b)?(a):(b))
134
124
135
125
#include " WCharacter.h"
136
126
#include " WString.h"
@@ -144,6 +134,17 @@ typedef unsigned int word;
144
134
#include " HardwareSerial.h"
145
135
#include " Esp.h"
146
136
137
+ #endif /* __cplusplus */
138
+
139
+ #ifndef _GLIBCXX_VECTOR
140
+ // arduino is not compatible with std::vector
141
+ #define min (a,b ) ((a)<(b)?(a):(b))
142
+ #define max (a,b ) ((a)>(b)?(a):(b))
143
+ #endif
144
+
145
+ #define _min (a,b ) ((a)<(b)?(a):(b))
146
+ #define _max (a,b ) ((a)>(b)?(a):(b))
147
+
147
148
#include " pins_arduino.h"
148
149
149
150
#endif /* _ESP32_CORE_ARDUINO_H_ */
You can’t perform that action at this time.
0 commit comments