# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1578908466 -7200
# Node ID 1a33088e7fa901a482face5b7747aec0e50637ce
# Parent  4fd6ee473d1b4841314e8be7e1fafa71b77eeba5
Rename some internal preprocessor macros.

diff -r 4fd6ee473d1b -r 1a33088e7fa9 th_string.c
--- a/th_string.c	Mon Jan 13 11:40:42 2020 +0200
+++ b/th_string.c	Mon Jan 13 11:41:06 2020 +0200
@@ -541,15 +541,15 @@
  * wildcards ? and *. "?" matches any character and "*" matches
  * any number of characters.
  */
-#define TH_STRMATCH_FUNC th_strmatch
-#define TH_STRMATCH_COLLATE(px) (px)
+#define TH_STRGLOB_FUNC th_strmatch
+#define TH_STRGLOB_COLLATE(px) (px)
 #include "th_strmatch.c"
 
 
 /* Compare a string to a pattern. Case-INSENSITIVE version.
  */
-#define TH_STRMATCH_FUNC th_strcasematch
-#define TH_STRMATCH_COLLATE(px) th_tolower(px)
+#define TH_STRGLOB_FUNC th_strcasematch
+#define TH_STRGLOB_COLLATE(px) th_tolower(px)
 #include "th_strmatch.c"
 
 
diff -r 4fd6ee473d1b -r 1a33088e7fa9 th_strmatch.c
--- a/th_strmatch.c	Mon Jan 13 11:40:42 2020 +0200
+++ b/th_strmatch.c	Mon Jan 13 11:41:06 2020 +0200
@@ -6,7 +6,7 @@
  * Please read file 'COPYING' for information on license and distribution.
  */
 
-BOOL TH_STRMATCH_FUNC (const char *haystack, const char *pattern)
+BOOL TH_STRGLOB_FUNC (const char *haystack, const char *pattern)
 {
     BOOL matched = TRUE, any = FALSE, end = FALSE;
     const char *tmp = NULL;
@@ -64,7 +64,7 @@
     default:
         if (any)
         {
-            if (TH_STRMATCH_COLLATE(*pattern) == TH_STRMATCH_COLLATE(*haystack))
+            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
             {
                 any = FALSE;
             }
@@ -76,7 +76,7 @@
         }
         else
         {
-            if (TH_STRMATCH_COLLATE(*pattern) == TH_STRMATCH_COLLATE(*haystack))
+            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
             {
                 if (*pattern)
                     pattern++;
@@ -103,6 +103,6 @@
 }
 
 
-#undef TH_STRMATCH_FUNC
-#undef TH_STRMATCH_COLLATE
+#undef TH_STRGLOB_FUNC
+#undef TH_STRGLOB_COLLATE