Permalink
Browse files

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

  • Loading branch information...
1 parent bd32fc0 commit 46de68253877ff656b643eea0e91bd5316833085 @Montellese Montellese committed Jul 26, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 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 ){

0 comments on commit 46de682

Please sign in to comment.