[PATCH] riched20: Avoid an ARRAY_SIZE-like macro

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/riched20/reader.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index 03101090b3..df131ec20f 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -2175,14 +2175,13 @@ static RTFKey	rtfKey[] =
 
 	{ 0,		-1,			NULL,		0 }
 };
-#define RTF_KEY_COUNT (sizeof(rtfKey) / sizeof(RTFKey))
 
 typedef struct tagRTFHashTableEntry {
 	int count;
 	RTFKey **value;
 } RTFHashTableEntry;
 
-static RTFHashTableEntry rtfHashTable[RTF_KEY_COUNT * 2];
+static RTFHashTableEntry rtfHashTable[ARRAY_SIZE(rtfKey) * 2];
 
 
 /*
@@ -2199,7 +2198,7 @@ void LookupInit(void)
 		int index;
 
 		rp->rtfKHash = Hash (rp->rtfKStr);
-		index = rp->rtfKHash % (RTF_KEY_COUNT * 2);
+		index = rp->rtfKHash % (ARRAY_SIZE(rtfKey) * 2);
 		if (!rtfHashTable[index].count)
 			rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *));
 		else
@@ -2212,7 +2211,7 @@ void LookupCleanup(void)
 {
 	unsigned int i;
 
-	for (i=0; i<RTF_KEY_COUNT*2; i++)
+	for (i=0; i<ARRAY_SIZE(rtfKey)*2; i++)
 	{
 		heap_free( rtfHashTable[i].value );
 		rtfHashTable[i].value = NULL;
@@ -2235,7 +2234,7 @@ static void Lookup(RTF_Info *info, char *s)
 
 	++s;			/* skip over the leading \ character */
 	hash = Hash (s);
-        entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)];
+        entry = &rtfHashTable[hash % (ARRAY_SIZE(rtfKey) * 2)];
 	for (i = 0; i < entry->count; i++)
 	{
                 rp = entry->value[i];
-- 
2.14.4