самопильный ХАЛ над библиотекой milandr SPL. позиционируется наличие порта порт на STM32 SPL.
Revisión | e757242906a2208c6f33edaa5382fa13ad98cd3b (tree) |
---|---|
Tiempo | 2022-06-27 02:12:14 |
Autor | alexrayne <alexraynepe196@gmai...> |
Commiter | alexrayne |
*contiki: safe MIN, MAX - for ISO C, not only for gcc
@@ -47,33 +47,5 @@ | ||
47 | 47 | |
48 | 48 | #define CC_CONF_WEAK __attribute__((__weak__)) |
49 | 49 | |
50 | - | |
51 | -#ifndef MAX | |
52 | -#define MAX(a,b) \ | |
53 | -({ \ | |
54 | - __typeof__ (a) _a = (a); \ | |
55 | - __typeof__ (b) _b = (b); \ | |
56 | - _a > _b ? _a : _b; \ | |
57 | -}) | |
58 | -#endif | |
59 | - | |
60 | -#ifndef MIN | |
61 | -#define MIN(a,b) \ | |
62 | -({ \ | |
63 | - __typeof__ (a) _a = (a); \ | |
64 | - __typeof__ (b) _b = (b); \ | |
65 | - _a < _b ? _a : _b; \ | |
66 | -}) | |
67 | -#endif | |
68 | - | |
69 | -#ifndef ABS | |
70 | -#define ABS(a) \ | |
71 | -({ \ | |
72 | - __typeof__ (a) _a = (a); \ | |
73 | - _a >= 0 ? _a : -_a; \ | |
74 | -}) | |
75 | -#endif | |
76 | - | |
77 | - | |
78 | 50 | #endif /* __GNUC__ */ |
79 | 51 | #endif /* _CC_GCC_H_ */ |
@@ -168,15 +168,29 @@ | ||
168 | 168 | #endif /* NULL */ |
169 | 169 | |
170 | 170 | #ifndef MAX |
171 | -#define MAX(n, m) (((n) < (m)) ? (m) : (n)) | |
171 | +#define MAX(a,b) \ | |
172 | +({ \ | |
173 | + __typeof__ (a) _a = (a); \ | |
174 | + __typeof__ (b) _b = (b); \ | |
175 | + _a > _b ? _a : _b; \ | |
176 | +}) | |
172 | 177 | #endif |
173 | 178 | |
174 | 179 | #ifndef MIN |
175 | -#define MIN(n, m) (((n) < (m)) ? (n) : (m)) | |
180 | +#define MIN(a,b) \ | |
181 | +({ \ | |
182 | + __typeof__ (a) _a = (a); \ | |
183 | + __typeof__ (b) _b = (b); \ | |
184 | + _a < _b ? _a : _b; \ | |
185 | +}) | |
176 | 186 | #endif |
177 | 187 | |
178 | 188 | #ifndef ABS |
179 | -#define ABS(n) (((n) < 0) ? -(n) : (n)) | |
189 | +#define ABS(a) \ | |
190 | +({ \ | |
191 | + __typeof__ (a) _a = (a); \ | |
192 | + _a >= 0 ? _a : -_a; \ | |
193 | +}) | |
180 | 194 | #endif |
181 | 195 | |
182 | 196 |