move ec_count_of in utils.h

diff --git a/include/ecoli_config.h b/include/ecoli_config.h
index ba93337..8ae15ed 100644 (file)
--- a/include/ecoli_config.h
+++ b/include/ecoli_config.h
@@ -17,11 +17,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#ifndef EC_COUNT_OF //XXX
-#define EC_COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / \
-               ((size_t)(!(sizeof(x) % sizeof(0[x])))))
-#endif
-
 struct ec_config;
 struct ec_dict;
 

diff --git a/include/ecoli_strvec.h b/include/ecoli_strvec.h
index 2464a2b..ee793e7 100644 (file)
--- a/include/ecoli_strvec.h
+++ b/include/ecoli_strvec.h
@@ -26,11 +26,6 @@
  */
 struct ec_strvec *ec_strvec(void);
 
-#ifndef EC_COUNT_OF
-#define EC_COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / \
-               ((size_t)(!(sizeof(x) % sizeof(0[x])))))
-#endif
-
 /**
  * Allocate a new string vector
  *

diff --git a/include/ecoli_utils.h b/include/ecoli_utils.h
index 7b76c17..7d6afcb 100644 (file)
--- a/include/ecoli_utils.h
+++ b/include/ecoli_utils.h
@@ -26,6 +26,12 @@
  */
 #define EC_VA_END ((void *)1)
 
+/**
+ * Count number of elements in an array.
+ */
+#define EC_COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / \
+               ((size_t)(!(sizeof(x) % sizeof(0[x])))))
+
 #endif
 
 /** @} */