Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 27 Dec 2012 19:36:57 +0100
From: Frank Dittrich <frank_dittrich@...mail.com>
To: john-dev@...ts.openwall.com
Subject: Re: Commit cf940c5a broke "make generic" on 64bit Linux
 system

On 12/27/2012 05:33 PM, Frank Dittrich wrote:
> An easier, but IMHO a somewhat ugly fix might be to change bench.c:
> 
> --- a/src/bench.c
> +++ b/src/bench.c
> @@ -44,8 +44,9 @@
>  #include "formats.h"
>  #include "bench.h"
> 
> -#ifndef _JOHN_BENCH_TMP
>  #include "options.h"
> +#ifdef _JOHN_BENCH_TMP
> +struct options_main_options;
>  #endif

May be a better fix is to add a new signals_g.o rule to Makefile,
similar to the config_g.o rule, use signals_g.o in BENCH_OBJS,
PARA_BENCH_32_OBVS and PARA_BENCH_OBJS,  and use #ifndef BENCH_BUILD
when accessing options.status_interval in sig_handle_timer.

Frank

Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ