[svn] Don't define countof if it's already defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 36ff4a1cf757ad009023a091ee0fcb6e8c8072fe..3a84779fe1cc19eaf971f6ab0fd03e0c913019e6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-02  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * hash.c: Don't define countof if it's already defined.
+
 2006-01-30  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * http.c: Changed output format. Removed excessively verbose debugging

diff --git a/src/hash.c b/src/hash.c
index c1feb6676995e4dad7de26acf4fa1f83e65f45e7..64451712bb9cefd88c09e3c79a7834b5e45bd6ea 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -50,7 +50,9 @@ so, delete this exception statement from your version.  */
 # define xnew_array(type, x) xmalloc (sizeof (type) * (x))
 # define xmalloc malloc
 # define xfree free
-# define countof(x) (sizeof (x) / sizeof ((x)[0]))
+# ifndef countof
+#  define countof(x) (sizeof (x) / sizeof ((x)[0]))
+# endif
 # define TOLOWER(x) ('A' <= (x) && (x) <= 'Z' ? (x) - 32 : (x))
 #endif