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

vijay <vijay_at_collab.net> writes:

> Index: subversion/mod_authz_svn/mod_authz_svn.c
> ===================================================================
> --- subversion/mod_authz_svn/mod_authz_svn.c (revision 1075316)
> +++ subversion/mod_authz_svn/mod_authz_svn.c (working copy)
> @@ -32,6 +32,7 @@
> #include <http_log.h>
> #include <ap_config.h>
> #include <ap_provider.h>
> +#include <ap_release.h>
> #include <apr_uri.h>
> #include <apr_lib.h>
> #include <mod_dav.h>
> @@ -519,12 +520,20 @@
> return OK;
> }
>
> +#if AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 3

I think this should be ap_mmm.h and AP_MODULE_MAGIC_AT_LEAST.

Perhaps we should be using AP_DECLARE_MODULE or AP_USE_MODULE somewhere
in mod_authz_svn?

> +#define LOG_ARGS_SIGNATURE const char *file, int line, int module_index
> +#define LOG_ARGS_CASCADE file, line, module_index
> +#else
> +#define LOG_ARGS_SIGNATURE const char *file, int line
> +#define LOG_ARGS_CASCADE file, line
> +#endif
> /* Log a message indicating the access control decision made about a
> - * request. FILE and LINE should be supplied via the APLOG_MARK macro.
> - * ALLOWED is boolean. REPOS_PATH and DEST_REPOS_PATH are information
> + * request. LOG_ARGS_SIGNATURE should be supplied via the APLOG_MARK macro
> + * with respect to Apache version. ALLOWED is boolean.
> + * REPOS_PATH and DEST_REPOS_PATH are information
> * about the request. DEST_REPOS_PATH may be NULL. */
> static void
> -log_access_verdict(const char *file, int line,
> +log_access_verdict(LOG_ARGS_SIGNATURE,
> const request_rec *r, int allowed,
> const char *repos_path, const char *dest_repos_path)
> {
> @@ -534,22 +543,22 @@
> if (r->user)
> {
> if (dest_repos_path)
> - ap_log_rerror(file, line, level, 0, r,
> + ap_log_rerror(LOG_ARGS_CASCADE, level, 0, r,
> "Access %s: '%s' %s %s %s", verdict, r->user,
> r->method, repos_path, dest_repos_path);
> else
> - ap_log_rerror(file, line, level, 0, r,
> + ap_log_rerror(LOG_ARGS_CASCADE, level, 0, r,
> "Access %s: '%s' %s %s", verdict, r->user,
> r->method, repos_path);
> }
> else
> {
> if (dest_repos_path)
> - ap_log_rerror(file, line, level, 0, r,
> + ap_log_rerror(LOG_ARGS_CASCADE, level, 0, r,
> "Access %s: - %s %s %s", verdict,
> r->method, repos_path, dest_repos_path);
> else
> - ap_log_rerror(file, line, level, 0, r,
> + ap_log_rerror(LOG_ARGS_CASCADE, level, 0, r,
> "Access %s: - %s %s", verdict,
> r->method, repos_path);
> }

-- 
Philip