utils/macros.h: Add <ctype.h> and `foocmp' helper macros.

[mLib] / utils / versioncmp.c

diff --git a/utils/versioncmp.c b/utils/versioncmp.c
index 3556916..e8bf9ae 100644 (file)
--- a/utils/versioncmp.c
+++ b/utils/versioncmp.c
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "macros.h"
 #include "versioncmp.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -79,7 +80,7 @@ static int vint(const char **vv, const char *vl)
 
   while (v < vl) {
     ch = *v;
-    if (!isdigit((unsigned char)ch))
+    if (!ISDIGIT(ch))
       break;
     v++;
     n = n * 10 + (ch - '0');
@@ -96,7 +97,7 @@ static const char *vchr(const char **vv, const char *vl)
 
   while (v < vl) {
     ch = *v;
-    if (isdigit((unsigned char)ch))
+    if (ISDIGIT(ch))
       break;
     v++;
   }
@@ -124,12 +125,12 @@ static int vcmp(const char *va, const char *val,
     pa = vchr(&va, val); pb = vchr(&vb, vbl);
     for (;;) {
       if (pa == va) ia = 1;
-      else if (isalpha((unsigned char)*pa)) ia = 2;
+      else if (ISALPHA(*pa)) ia = 2;
       else if (*pa == '~') ia = 0;
       else ia = 3;
 
       if (pb == vb) ib = 1;
-      else if (isalpha((unsigned char)*pb)) ib = 2;
+      else if (ISALPHA(*pb)) ib = 2;
       else if (*pb == '~') ib = 0;
       else ib = 3;