commit 27a8c5302079de37bd3f4b39a474c0bf1ae6ca5c
author Pekka Paalanen <ppaalanen@gmail.com> Tue Sep 04 13:55:43 2012 +0300
committer Kristian Høgsberg <krh@bitplanet.net> Tue Sep 04 16:15:36 2012 -0400
tree 0dbd690104662633c53c60d05a89ee5fe0f4b93b
parent 85a46671dbaa738f38407074c90353011ea9c982

compositor: do not duplicate ARRAY_SIZE

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 9befd0f..868afe9 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -55,9 +55,6 @@
 #include "../shared/os-compatibility.h"
 #include "git-version.h"
 
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
-
-
 static struct wl_list child_process_list;
 static struct weston_compositor *segv_compositor;
 
@@ -1246,7 +1243,7 @@
 
 	glUseProgram(compositor->solid_shader.program);
 	glUniform4fv(compositor->solid_shader.color_uniform, 1,
-			color[color_idx++ % ARRAY_SIZE(color)]);
+			color[color_idx++ % ARRAY_LENGTH(color)]);
 	glDrawElements(GL_LINES, nelems, GL_UNSIGNED_SHORT, buffer);
 	glUseProgram(compositor->current_shader->program);
 	free(buffer);