From 0dda10e3a9b3de17deccd4b66495a020307df68b Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 27 Jun 2019 07:25:06 -0700 Subject: GTK3/Benchmarks disable guibench only GTK3 build inadvertably disabled all benchmarking. At present, the GTK3 build intentionally avoids building of "guibench" due to non-trivial changes from GTK2 to GTK3. However, all other benchmarks were disabled as well. This was not by design, as non-gui benchmarks have no GTK3 dependencies. The reason benchmarks were diasbled (did not show up in the menus) was that the code for "benchark_gui" still referenced the missing "guibench" routine. This routine was not present in the "benchmark.so", so the library would not load due to the missing entry point. This patch addresses the issue. All benchmarks (except guibench) show/work fine with GTK3. Signed-off-by: Juro Bystricky --- modules/benchmark/benches.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules') diff --git a/modules/benchmark/benches.c b/modules/benchmark/benches.c index 2cb8ee9c..6343d95b 100644 --- a/modules/benchmark/benches.c +++ b/modules/benchmark/benches.c @@ -54,6 +54,7 @@ BENCH_SCAN_SIMPLE(scan_cryptohash, benchmark_cryptohash, BENCHMARK_CRYPTOHASH); BENCH_SCAN_SIMPLE(scan_fib, benchmark_fib, BENCHMARK_FIB); BENCH_SCAN_SIMPLE(scan_zlib, benchmark_zlib, BENCHMARK_ZLIB); +#if !GTK_CHECK_VERSION(3,0,0) void scan_gui(gboolean reload) { SCAN_START(); @@ -73,6 +74,7 @@ void scan_gui(gboolean reload) } SCAN_END(); } +#endif static ModuleEntry entries[] = { {N_("CPU Blowfish (Single-thread)"), "blowfish.png", callback_bfsh_single, scan_bfsh_single, MODULE_FLAG_NONE}, -- cgit v1.2.3