summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Canete <use.less01@gmail.com>2012-10-28 20:35:16 +0000
committerTim Angus <tim@ngus.net>2013-01-12 21:20:55 +0000
commit6e706fdb542bc6e0972248fccab20e47aed38037 (patch)
treedd31f9ca46102b85f671c413cb2704c1f3392aa2 /src
parent8de7ce8c82617c0ced22227a7853c1f4b8d46157 (diff)
Remove ARRAY_SIZE, and use ARRAY_LEN instead.
Diffstat (limited to 'src')
-rw-r--r--src/rend2/tr_init.c4
-rw-r--r--src/rend2/tr_local.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/rend2/tr_init.c b/src/rend2/tr_init.c
index 1df69358..0f14c081 100644
--- a/src/rend2/tr_init.c
+++ b/src/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/src/rend2/tr_local.h b/src/rend2/tr_local.h
index c86091d7..5266c1d7 100644
--- a/src/rend2/tr_local.h
+++ b/src/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