$NetBSD$

--- src/modules/standard/mod_mime_magic.c.orig	2009-03-04 09:50:55.000000000 +0300
+++ src/modules/standard/mod_mime_magic.c
@@ -213,7 +213,7 @@ static int parse(server_rec *, pool *p, 
 static int match(request_rec *, unsigned char *, int);
 static int mget(request_rec *, union VALUETYPE *, unsigned char *,
 		struct magic *, int);
-static int mcheck(request_rec *, union VALUETYPE *, struct magic *);
+static int ap_mcheck(request_rec *, union VALUETYPE *, struct magic *);
 static void mprint(request_rec *, union VALUETYPE *, struct magic *);
 
 static int uncompress(request_rec *, int, 
@@ -1563,7 +1563,7 @@ static int match(request_rec *r, unsigne
 
 	/* check if main entry matches */
 	if (!mget(r, &p, s, m, nbytes) ||
-	    !mcheck(r, &p, m)) {
+	    !ap_mcheck(r, &p, m)) {
 	    struct magic *m_cont;
 
 	    /*
@@ -1634,7 +1634,7 @@ static int match(request_rec *r, unsigne
 		    cont_level = m->cont_level;
 		}
 		if (mget(r, &p, s, m, nbytes) &&
-		    mcheck(r, &p, m)) {
+		    ap_mcheck(r, &p, m)) {
 		    /*
 		     * This continuation matched. Print its message, with a
 		     * blank before it if the previous item printed and this
@@ -1808,7 +1808,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 ap_mcheck(request_rec *r, union VALUETYPE *p, struct magic *m)
 {
     register unsigned long l = m->value.l;
     register unsigned long v;
@@ -1861,7 +1861,7 @@ static int mcheck(request_rec *r, union 
     default:
 	/*  bogosity, pretend that it just wasn't a match */
 	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
-		    MODNAME ": invalid type %d in mcheck().", m->type);
+		    MODNAME ": invalid type %d in ap_mcheck().", m->type);
 	return 0;
     }
 
@@ -1946,7 +1946,7 @@ static int mcheck(request_rec *r, union 
 	/* bogosity, pretend it didn't match */
 	matched = 0;
 	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
-		    MODNAME ": mcheck: can't happen: invalid relation %d.",
+		    MODNAME ": ap_mcheck: can't happen: invalid relation %d.",
 		    m->reln);
 	break;
     }
