diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 21:59:43 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 21:59:43 +0100 |
| commit | 41f8bf57c4d80cbec89b90b901afa9df4d2d76f1 (patch) | |
| tree | 394b8681a159ef61fdacfc3b393d5b2d71733486 /lib | |
| parent | 56027b5cbd7f432d30f7fc99bcf8680c840e6163 (diff) | |
Changes identifiers to avoid use of reserved ones.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/birdlib.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/birdlib.h b/lib/birdlib.h index b7a5a6a6..04fb7fed 100644 --- a/lib/birdlib.h +++ b/lib/birdlib.h @@ -20,14 +20,14 @@ /* Utility macros */ -#define _MIN(a,b) (((a)<(b))?(a):(b)) -#define _MAX(a,b) (((a)>(b))?(a):(b)) +#define MIN_(a,b) (((a)<(b))?(a):(b)) +#define MAX_(a,b) (((a)>(b))?(a):(b)) #ifndef PARSER #undef MIN #undef MAX -#define MIN(a,b) _MIN(a,b) -#define MAX(a,b) _MAX(a,b) +#define MIN(a,b) MIN_(a,b) +#define MAX(a,b) MAX_(a,b) #endif #define ABS(a) ((a)>=0 ? (a) : -(a)) @@ -54,17 +54,17 @@ typedef s64 btime; -#define _S *1000000 -#define _MS *1000 -#define _US *1 +#define S_ *1000000 +#define MS_ *1000 +#define US_ *1 #define TO_S /1000000 #define TO_MS /1000 #define TO_US /1 #ifndef PARSER -#define S _S -#define MS _MS -#define US _US +#define S S_ +#define MS MS_ +#define US US_ #endif |