[cosmetic] mysqldataset: fix "'ARRAYSIZE': macro redefinition" warning

xbmc · Jul 28, 2012 · 46de682 · 46de682
1 parent bd32fc0
commit 46de682
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp
@@ -460,7 +460,7 @@ string MysqlDatabase::vprepare(const char *format, va_list args)
 
 #define etINVALID     0 /* Any unrecognized conversion type */
 
-#define ARRAYSIZE(X)    ((int)(sizeof(X)/sizeof(X[0])))
+#define ARRAY_SIZE(X)    ((int)(sizeof(X)/sizeof(X[0])))
 
 /*
 ** An "etByte" is an 8-bit unsigned value.
@@ -732,7 +732,7 @@ void MysqlDatabase::mysqlVXPrintf(
     /* Fetch the info entry for the field */
     infop = &fmtinfo[0];
     xtype = etINVALID;
-    for(idx=0; idx<ARRAYSIZE(fmtinfo); idx++){
+    for(idx=0; idx<ARRAY_SIZE(fmtinfo); idx++){
       if( c==fmtinfo[idx].fmttype ){
         infop = &fmtinfo[idx];
         if( useExtended || (infop->flags & FLAG_INTERN)==0 ){