Commit a0d4401d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

libs/port: Avoid an ARRAY_SIZE-like macro.

parent 52ed7888
...@@ -175,8 +175,6 @@ static const union cptable * const cptables[72] = ...@@ -175,8 +175,6 @@ static const union cptable * const cptables[72] =
/* ### cpmap end ### */ /* ### cpmap end ### */
/* Everything above this line is generated automatically by make_unicode */ /* Everything above this line is generated automatically by make_unicode */
#define NB_CODEPAGES (sizeof(cptables)/sizeof(cptables[0]))
static int cmp_codepage( const void *codepage, const void *entry ) static int cmp_codepage( const void *codepage, const void *entry )
{ {
...@@ -189,7 +187,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) ...@@ -189,7 +187,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage )
{ {
const union cptable **res; const union cptable **res;
if (!(res = bsearch( &codepage, cptables, NB_CODEPAGES, if (!(res = bsearch( &codepage, cptables, ARRAY_SIZE( cptables ),
sizeof(cptables[0]), cmp_codepage ))) return NULL; sizeof(cptables[0]), cmp_codepage ))) return NULL;
return *res; return *res;
} }
...@@ -198,6 +196,6 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) ...@@ -198,6 +196,6 @@ const union cptable *wine_cp_get_table( unsigned int codepage )
/* enum valid codepages */ /* enum valid codepages */
const union cptable *wine_cp_enum_table( unsigned int index ) const union cptable *wine_cp_enum_table( unsigned int index )
{ {
if (index >= NB_CODEPAGES) return NULL; if (index >= ARRAY_SIZE( cptables )) return NULL;
return cptables[index]; return cptables[index];
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment