[quake3-commits] r2339 - trunk/code/rend2

[DONOTREPLY at icculus.org]

Author: smiletheory
Date: 2012-10-28 16:35:16 -0400 (Sun, 28 Oct 2012)
New Revision: 2339

Modified:
   trunk/code/rend2/tr_init.c
   trunk/code/rend2/tr_local.h
Log:
Remove ARRAY_SIZE, and use ARRAY_LEN instead.

Modified: trunk/code/rend2/tr_init.c
===================================================================
--- trunk/code/rend2/tr_init.c	2012-10-28 20:22:13 UTC (rev 2338)
+++ trunk/code/rend2/tr_init.c	2012-10-28 20:35:16 UTC (rev 2339)
@@ -1311,7 +1311,7 @@
 		return;
 
 #ifdef REACTION
-	qglGenQueriesARB(ARRAY_SIZE(tr.sunFlareQuery), tr.sunFlareQuery);
+	qglGenQueriesARB(ARRAY_LEN(tr.sunFlareQuery), tr.sunFlareQuery);
 #endif
 }
 
@@ -1321,7 +1321,7 @@
 		return;
 
 #ifdef REACTION
-	qglDeleteQueriesARB(ARRAY_SIZE(tr.sunFlareQuery), tr.sunFlareQuery);
+	qglDeleteQueriesARB(ARRAY_LEN(tr.sunFlareQuery), tr.sunFlareQuery);
 #endif
 }
 

Modified: trunk/code/rend2/tr_local.h
===================================================================
--- trunk/code/rend2/tr_local.h	2012-10-28 20:22:13 UTC (rev 2338)
+++ trunk/code/rend2/tr_local.h	2012-10-28 20:35:16 UTC (rev 2339)
@@ -40,10 +40,6 @@
 
 #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