Michael Stefaniuc : glu32: Avoid an ARRAY_SIZE-like macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: de8c478c4305ecb8ea5138b4235adb3a4d521cc2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=de8c478c4305ecb8ea5138b42...

Author: Michael Stefaniuc 
Date:   Thu Jul  5 22:07:21 2018 +0200

glu32: Avoid an ARRAY_SIZE-like macro.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/glu32/glu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index 973e448..8f0a360 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -91,7 +91,6 @@ static const struct { GLuint err; const char *str; } errors[] =
     { GLU_NURBS_ERROR36, "null control point reference" },
     { GLU_NURBS_ERROR37, "duplicate point on piecewise linear trimming curve" },
 };
-#define NB_ERRORS (sizeof(errors) / sizeof(errors[0]))

typedef void (*_GLUfuncptr)(void);

@@ -148,7 +147,7 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode )
 {
     unsigned int i;

-    for (i = 0; i < NB_ERRORS; i++)
+    for (i = 0; i < ARRAY_SIZE(errors); i++)
         if (errors[i].err == errCode) return (const GLubyte *)errors[i].str;

return NULL;
@@ -159,10 +158,10 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode )
  */
 const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode )
 {
-    static WCHAR errorsW[NB_ERRORS][64];
+    static WCHAR errorsW[ARRAY_SIZE(errors)][64];
     unsigned int i, j;

-    for (i = 0; i < NB_ERRORS; i++)
+    for (i = 0; i < ARRAY_SIZE(errors); i++)
     {
         if (errors[i].err != errCode) continue;
         if (!errorsW[i][0])  /* errors use only ASCII, do a simple mapping */