tor

commit 1e07b4031e2613826cf7ff2838a2f0c8f03e81c2
parent 0932f322911f41e72b5155d06775658039814a39
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 22 Jun 2018 08:41:57 -0400

Move ARRAY_LENGTH to compiler_compat.h

Diffstat:
M
src/common/util.h
 | 
2
--
M
src/lib/cc/compat_compiler.h
 | 
3
+++

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/util.h b/src/common/util.h
@@ -451,6 +451,4 @@ STATIC int format_helper_exit_status(unsigned char child_state,
 
 #endif /* defined(UTIL_PRIVATE) */
 
-#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0]))
-
 #endif /* !defined(TOR_UTIL_H) */
diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h
@@ -253,4 +253,7 @@
  */
 #define STRUCT_VAR_P(st, off) ((void*) ( ((char*)(st)) + (off) ) )
 
+/** Macro: Yields the number of elements in array x. */
+#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0]))
+
 #endif /* !defined(TOR_COMPAT_H) */