From: Brian Paul <brianp@vmware.com>
Date: Sat, 28 Feb 2015 20:33:11 +0000 (-0700)
Subject: mesa: remove extra definition of ARRAY_SIZE in src/mesa/main/macros.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f0e9c2e393ba17829e1338dc035c25f22a2718c;p=mesa.git

mesa: remove extra definition of ARRAY_SIZE in src/mesa/main/macros.h

Already defined in src/util/macros.h

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index da5e8e849a2..2d7a6a107fd 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -803,10 +803,6 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y)
 #define ENUM_TO_DOUBLE(E)  ((GLdouble)(GLint)(E))
 #define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE)
 
-/* Compute the size of an array */
-#ifndef ARRAY_SIZE
-#  define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#endif
 
 /* Stringify */
 #define STRINGIFY(x) #x