Skip to content

Commit d6c3bb8

Browse files
committed
Cleaned up crude fixes for name clashes in wire header.
1 parent 194af8b commit d6c3bb8

File tree

1 file changed

+0
-37
lines changed

1 file changed

+0
-37
lines changed

cpp/arduino/Wire.h

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -34,43 +34,6 @@
3434
#pragma once
3535

3636
#include <inttypes.h>
37-
38-
// https://github.com/Arduino-CI/arduino_ci/issues/165
39-
#ifdef max
40-
#undef max
41-
#ifdef __cplusplus
42-
template <class T, class L>
43-
auto max(const T &a, const L &b) -> decltype((b < a) ? b : a) {
44-
return (a < b) ? b : a;
45-
}
46-
#else
47-
#define max(a, b) \
48-
({ \
49-
__typeof__(a) _a = (a); \
50-
__typeof__(b) _b = (b); \
51-
_a > _b ? _a : _b; \
52-
})
53-
#endif
54-
#endif
55-
56-
#ifdef min
57-
#undef min
58-
#ifdef __cplusplus
59-
template <class T, class L>
60-
auto min(const T &a, const L &b) -> decltype((b > a) ? b : a) {
61-
return (a > b) ? b : a;
62-
}
63-
#else
64-
#define min(a, b) \
65-
({ \
66-
__typeof__(a) _a = (a); \
67-
__typeof__(b) _b = (b); \
68-
_a < _b ? _a : _b; \
69-
})
70-
#endif
71-
#endif
72-
73-
7437
#include "Stream.h"
7538
#include <cassert>
7639
#include <deque>

0 commit comments

Comments
 (0)