* intdoc.c (ARRAY_SIZE): Remove macro.

	* proj.h (ARRAY_SIZE): Remove macro.
	* com.c (init_decl_processing): Use ARRAY_SIZE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35950 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 7ddb8be..6a10820 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-24  Greg McGary  <greg@mcgary.org>
+
+       * intdoc.c (ARRAY_SIZE): Remove macro.
+       * proj.h (ARRAY_SIZE): Remove macro.
+       * com.c (init_decl_processing): Use ARRAY_SIZE.
+
 2000-08-22  Toon Moene  <toon@moene.indiv.nluug.nl>
 
        * com-rt.def: Adapt macro DEFGFRT to accept CONST boolean.

diff --git a/gcc/f/com.c b/gcc/f/com.c
index 73f8408..93d8c44 100644 (file)
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -14804,7 +14804,7 @@ init_decl_processing ()
   malloc_init ();
 
   /* Record our roots.  */
-  for (i = 0; i < sizeof(tree_roots)/sizeof(tree_roots[0]); i++)
+  for (i = 0; i < ARRAY_SIZE (tree_roots); i++)
     ggc_add_tree_root (tree_roots[i], 1);
   ggc_add_tree_root (&ffecom_tree_type[0][0], 
                     FFEINFO_basictype*FFEINFO_kindtype);

diff --git a/gcc/f/intdoc.c b/gcc/f/intdoc.c
index 91c6b3c..cc18f03 100644 (file)
--- a/gcc/f/intdoc.c
+++ b/gcc/f/intdoc.c
@@ -1,5 +1,5 @@
 /* intdoc.c
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
 This file is part of GNU Fortran.
@@ -37,8 +37,6 @@ typedef enum
     Doggone_Trailing_Comma_Dont_Work = 1
   } bool;
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-
 /* Pull in the intrinsics info, but only the doc parts.  */
 #define FFEINTRIN_DOC 1
 #include "intrin.h"

diff --git a/gcc/f/proj.h b/gcc/f/proj.h
index d0b41a2..0a180d3 100644 (file)
--- a/gcc/f/proj.h
+++ b/gcc/f/proj.h
@@ -1,5 +1,5 @@
 /* proj.h file for Gnu Fortran
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
 This file is part of GNU Fortran.
@@ -58,8 +58,6 @@ typedef enum
     Doggone_Trailing_Comma_Dont_Work = 1
   } bool;
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-
 #ifndef UNUSED /* Compile with -DUNUSED= if cc doesn't support this. */
 #define UNUSED ATTRIBUTE_UNUSED
 #endif  /* !defined (UNUSED) */