From 3dff29e991ae8f0fafd3e52e6fe15c25cc6ea4cd Mon Sep 17 00:00:00 2001 From: James Canete Date: Sun, 28 Oct 2012 20:35:16 +0000 Subject: [PATCH] Remove ARRAY_SIZE, and use ARRAY_LEN instead. --- code/rend2/tr_init.c | 4 ++-- code/rend2/tr_local.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/rend2/tr_init.c b/code/rend2/tr_init.c index 1df69358..0f14c081 100644 --- a/code/rend2/tr_init.c +++ b/code/rend2/tr_init.c @@ -1311,7 +1311,7 @@ void R_InitQueries(void) return; #ifdef REACTION - qglGenQueriesARB(ARRAY_SIZE(tr.sunFlareQuery), tr.sunFlareQuery); + qglGenQueriesARB(ARRAY_LEN(tr.sunFlareQuery), tr.sunFlareQuery); #endif } @@ -1321,7 +1321,7 @@ void R_ShutDownQueries(void) return; #ifdef REACTION - qglDeleteQueriesARB(ARRAY_SIZE(tr.sunFlareQuery), tr.sunFlareQuery); + qglDeleteQueriesARB(ARRAY_LEN(tr.sunFlareQuery), tr.sunFlareQuery); #endif } diff --git a/code/rend2/tr_local.h b/code/rend2/tr_local.h index c86091d7..5266c1d7 100644 --- a/code/rend2/tr_local.h +++ b/code/rend2/tr_local.h @@ -40,10 +40,6 @@ typedef unsigned int glIndex_t; #define BUFFER_OFFSET(i) ((char *)NULL + (i)) -#ifndef ARRAY_SIZE -# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) -#endif - // everything that is needed by the backend needs // to be double buffered to allow it to run in // parallel on a dual cpu machine