[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Compiling subversion trunk with httpd trunk code fails

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Tue, 01 Mar 2011 17:21:32 +0000

vijay <vijay_at_collab.net> writes:

> * This function is used as a provider to allow mod_dav_svn to bypass the
> @@ -580,7 +624,11 @@
> if (!conf->anonymous
> || (! (conf->access_file || conf->repo_relative_access_file)))
> {
> - log_access_verdict(APLOG_MARK, r, 0, repos_path, NULL);
> +#if AP_MODULE_MAGIC_AT_LEAST(20100606,0)
> + log_access_verdict_httpd_v23(APLOG_MARK, r, 0, repos_path, NULL);
> +#else
> + log_access_verdict_httpd_v22(APLOG_MARK, r, 0, repos_path, NULL);
> +#endif

No! If you are going to use separate functions then write:

static void log_access_verdict(...)
{
#if AP_MODULE_MAGIC_AT_LEAST(...)
   log_access_verdict_httpd_v23(...)
#else
   log_access_verdict_httpd_v22(...)
#endif
}

so that the callers don't have to change.

On the whole I preferred the macro solution.

-- 
Philip
Received on 2011-03-01 18:22:16 CET

This is an archived mail posted to the Subversion Dev mailing list.