Skip to content

Commit a2c15a1

Browse files
committed
lib/contiki: drop some generic defines
Drop the MIN/MAX macros from the contiki includes. These can conflict with other definitions, and are not used in the code.
1 parent 977f8cc commit a2c15a1

File tree

1 file changed

+0
-12
lines changed
  • lib/contiki-core/sys

1 file changed

+0
-12
lines changed

lib/contiki-core/sys/cc.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,6 @@
134134
#define NULL 0
135135
#endif /* NULL */
136136

137-
#ifndef MAX
138-
#define MAX(n, m) (((n) < (m)) ? (m) : (n))
139-
#endif
140-
141-
#ifndef MIN
142-
#define MIN(n, m) (((n) < (m)) ? (n) : (m))
143-
#endif
144-
145-
#ifndef ABS
146-
#define ABS(n) (((n) < 0) ? -(n) : (n))
147-
#endif
148-
149137

150138
#define CC_CONCAT2(s1, s2) s1##s2
151139
/**

0 commit comments

Comments
 (0)