X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=regex.c;h=435b8aebd736ef2798127fee9e41ec0a6a2dfbac;hp=eefc2cb9b7b37909e98b1d0b45e85a2d1d255522;hb=643be053e447a35cccc37550ac0087bb5bb5c5ad;hpb=67b2c8d6719bccd621e47b59cb89b9e2cb97d4f5

diff --git a/regex.c b/regex.c
index eefc2cb..435b8ae 100644
--- a/regex.c
+++ b/regex.c
@@ -50,7 +50,7 @@
 #undef        _GNU_SOURCE
 #define _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -168,7 +168,7 @@ extern char *re_syntax_table;
 
 static char re_syntax_table[CHAR_SET_SIZE];
 
-enum { MUTT_ALNUM, MUTT_ALPHA, MUTT_BLANK, MUTT_CNTRL, MUTT_DIGIT, MUTT_GRAPH,
+enum { MUTT_ALNUM = 1, MUTT_ALPHA, MUTT_BLANK, MUTT_CNTRL, MUTT_DIGIT, MUTT_GRAPH,
        MUTT_LOWER, MUTT_PRINT, MUTT_PUNCT, MUTT_SPACE, MUTT_UPPER, MUTT_XDIGIT,
        MUTT_INVALID
      };
@@ -202,24 +202,6 @@ static int ctype(const char *name)
   return MUTT_INVALID;
 }
 
-static int isctype(char c, int desc)
-{
-  switch (desc) {
-    case MUTT_ALNUM: return isalnum(c);
-    case MUTT_ALPHA: return isalpha(c);
-    case MUTT_BLANK: return isblank(c);
-    case MUTT_CNTRL: return iscntrl(c);
-    case MUTT_DIGIT: return isdigit(c);
-    case MUTT_GRAPH: return isgraph(c);
-    case MUTT_LOWER: return islower(c);
-    case MUTT_PRINT: return isprint(c);
-    case MUTT_PUNCT: return ispunct(c);
-    case MUTT_SPACE: return isspace(c);
-    case MUTT_UPPER: return isupper(c);
-    case MUTT_XDIGIT: return isxdigit(c);
-  }
-  return 0; /* false */
-}
 
 static void
 init_syntax_once ()
@@ -1859,6 +1841,27 @@ static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
 #define FREE_STACK_RETURN(value)                \
   return (free (compile_stack.stack), value)                /* __MEM_CHECKED__ */
 
+#ifndef HAVE_ISCTYPE
+static int isctype(char c, int desc)
+{
+  switch (desc) {
+    case MUTT_ALNUM: return ISALNUM(c);
+    case MUTT_ALPHA: return ISALPHA(c);
+    case MUTT_BLANK: return ISBLANK(c);
+    case MUTT_CNTRL: return ISCNTRL(c);
+    case MUTT_DIGIT: return ISDIGIT(c);
+    case MUTT_GRAPH: return ISGRAPH(c);
+    case MUTT_LOWER: return ISLOWER(c);
+    case MUTT_PRINT: return ISPRINT(c);
+    case MUTT_PUNCT: return ISPUNCT(c);
+    case MUTT_SPACE: return ISSPACE(c);
+    case MUTT_UPPER: return ISUPPER(c);
+    case MUTT_XDIGIT: return ISXDIGIT(c);
+  }
+  return 0; /* false */
+}
+#endif
+
 static reg_errcode_t
 regex_compile (pattern, size, syntax, bufp)
      const char *pattern;