$NetBSD$

--- modules/metadata/mod_mime_magic.c.orig	2006-10-03 05:47:35.000000000 -0700
+++ modules/metadata/mod_mime_magic.c
@@ -226,7 +226,7 @@ static int parse(server_rec *, apr_pool_
 static int match(request_rec *, unsigned char *, apr_size_t);
 static int mget(request_rec *, union VALUETYPE *, unsigned char *,
                 struct magic *, apr_size_t);
-static int mcheck(request_rec *, union VALUETYPE *, struct magic *);
+static int mod_mime_magic_mcheck(request_rec *, union VALUETYPE *, struct magic *);
 static void mprint(request_rec *, union VALUETYPE *, struct magic *);
 
 static int uncompress(request_rec *, int,
@@ -1580,7 +1580,7 @@ static int match(request_rec *r, unsigne
 
         /* check if main entry matches */
         if (!mget(r, &p, s, m, nbytes) ||
-            !mcheck(r, &p, m)) {
+            !mod_mime_magic_mcheck(r, &p, m)) {
             struct magic *m_cont;
 
             /*
@@ -1651,7 +1651,7 @@ static int match(request_rec *r, unsigne
                     cont_level = m->cont_level;
                 }
                 if (mget(r, &p, s, m, nbytes) &&
-                    mcheck(r, &p, m)) {
+                    mod_mime_magic_mcheck(r, &p, m)) {
                     /*
                      * This continuation matched. Print its message, with a
                      * blank before it if the previous item printed and this
@@ -1824,7 +1824,7 @@ static int mget(request_rec *r, union VA
     return 1;
 }
 
-static int mcheck(request_rec *r, union VALUETYPE *p, struct magic *m)
+static int mod_mime_magic_mcheck(request_rec *r, union VALUETYPE *p, struct magic *m)
 {
     register unsigned long l = m->value.l;
     register unsigned long v;
@@ -1877,7 +1877,7 @@ static int mcheck(request_rec *r, union 
     default:
         /*  bogosity, pretend that it just wasn't a match */
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                    MODNAME ": invalid type %d in mcheck().", m->type);
+                    MODNAME ": invalid type %d in mod_mime_magic_mcheck().", m->type);
         return 0;
     }
 
@@ -1962,7 +1962,7 @@ static int mcheck(request_rec *r, union 
         /* bogosity, pretend it didn't match */
         matched = 0;
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                    MODNAME ": mcheck: can't happen: invalid relation %d.",
+                    MODNAME ": mod_mime_magic_mcheck: can't happen: invalid relation %d.",
                     m->reln);
         break;
     }