diff options
| -rw-r--r-- | newlib/ChangeLog | 6 | ||||
| -rw-r--r-- | newlib/libc/search/hash.c | 4 | ||||
| -rw-r--r-- | newlib/libc/search/hash_buf.c | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 58b354c..43ca24a 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2004-05-26 Jeff Johnston <jjohnstn@redhat.com> + + * libc/search/hash_buf.c: Protect MAX and MIN macros from + redefinition. + * libc/search/hash.c: Ditto. + 2004-05-25 Artem B. Bityuckiy <abitytsky@softminecorp.com> * newlib.hin: (_WANT_IO_POS_ARGS): New define. diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c index 1b045e8..3d91928 100644 --- a/newlib/libc/search/hash.c +++ b/newlib/libc/search/hash.c @@ -78,8 +78,12 @@ static void swap_header_copy(HASHHDR *, HASHHDR *); #endif /* Macros for min/max. */ +#ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) +#endif +#ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) +#endif /* Fast arithmetic, relying on powers of 2, */ #define MOD(x, y) ((x) & ((y) - 1)) diff --git a/newlib/libc/search/hash_buf.c b/newlib/libc/search/hash_buf.c index 3979bcd..3dfc206 100644 --- a/newlib/libc/search/hash_buf.c +++ b/newlib/libc/search/hash_buf.c @@ -94,8 +94,12 @@ static BUFHEAD *newbuf(HTAB *, __uint32_t, BUFHEAD *); #define LRU_INSERT(B) BUF_INSERT((B), LRU) /* Macros for min/max. */ +#ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) +#endif +#ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) +#endif /* * We are looking for a buffer with address "addr". If prev_bp is NULL, then |