diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cpphash.h | 4 | ||||
| -rw-r--r-- | gcc/cpplex.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cb97f08..6b7d3fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-02-03 Neil Booth <neil@daikokuya.demon.co.uk> + + * cpphash.h: Rename ALIGN _ALIGN. + * cpplex.c (new_chunk, _cpp_pool_reserve): Update. + Fri Feb 2 23:15:29 2001 Christopher Faylor <cgf@cygnus.com> * config/i386/cygwin.h (CPP_SPEC): Reorganize YA to better handle cross diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 77c80cd..7374488 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -43,14 +43,14 @@ struct htab; #define CPP_STACK_MAX 200 /* Memory pools. */ -#define ALIGN(size, align) (((size) + ((align) - 1)) & ~((align) - 1)) +#define _ALIGN(size, align) (((size) + ((align) - 1)) & ~((align) - 1)) #define POOL_FRONT(p) ((p)->cur->front) #define POOL_LIMIT(p) ((p)->cur->limit) #define POOL_BASE(p) ((p)->cur->base) #define POOL_SIZE(p) ((p)->cur->limit - (p)->cur->base) #define POOL_ROOM(p) ((p)->cur->limit - (p)->cur->front) #define POOL_USED(p) ((p)->cur->front - (p)->cur->base) -#define POOL_COMMIT(p, len) do {((p)->cur->front += ALIGN (len, (p)->align));\ +#define POOL_COMMIT(p, len) do {((p)->cur->front += _ALIGN (len, (p)->align));\ if ((p)->cur->front > (p)->cur->limit) abort ();} while (0) typedef struct cpp_chunk cpp_chunk; diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 3ff23b4..b23e56f 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -1759,7 +1759,7 @@ new_chunk (size) unsigned char *base; cpp_chunk *result; - size = ALIGN (size, DEFAULT_ALIGNMENT); + size = _ALIGN (size, DEFAULT_ALIGNMENT); base = (unsigned char *) xmalloc (size + sizeof (cpp_chunk)); /* Put the chunk descriptor at the end. Then chunk overruns will cause obvious chaos. */ @@ -1826,7 +1826,7 @@ _cpp_pool_reserve (pool, len) cpp_pool *pool; unsigned int len; { - len = ALIGN (len, pool->align); + len = _ALIGN (len, pool->align); if (len > (unsigned int) POOL_ROOM (pool)) _cpp_next_chunk (pool, len, 0); |