cpphash.h: Rename ALIGN _ALIGN.

        * cpphash.h: Rename ALIGN _ALIGN.
        * cpplex.c (new_chunk, _cpp_pool_reserve): Update.

From-SVN: r39433

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb97f0884ffb725044848856d619f1e01d8d2823..6b7d3fed1b2ecd35488ed4ea04ecd4f78365053d 100644 (file)
--- 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 77c80cdc00d556478313004859e754596c762320..73744889392244a37bd1f400a8732da06920300c 100644 (file)
--- 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 3ff23b4abac97f88f6460edd9da8ad70909ad007..b23e56fcdfd5a6f03867c8d95f2c4a3eb73c53d1 100644 (file)
--- 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);