From 13c1ae2b3e0dd4479fc47da50eff8b84d0e55f23 Mon Sep 17 00:00:00 2001 From: Lukas Bergdoll Date: Thu, 22 Jan 2026 08:52:14 +0100 Subject: [PATCH] Fix GCC 15 warnings and errors --- tpch-dbgen/driver.c | 24 ++++++++++++------------ tpch-dbgen/dss.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tpch-dbgen/driver.c b/tpch-dbgen/driver.c index 7904439..9fac3ab 100644 --- a/tpch-dbgen/driver.c +++ b/tpch-dbgen/driver.c @@ -54,8 +54,8 @@ /* main driver for dss banchmark */ #define DECLARER /* EXTERN references get defined here */ -#define NO_FUNC (int (*) ()) NULL /* to clean up tdefs */ -#define NO_LFUNC (long (*) ()) NULL /* to clean up tdefs */ + +static long no_lfunc(int, long long int) {} #include "config.h" #include "release.h" @@ -179,25 +179,25 @@ long sd_part_psupp (int child, DSS_HUGE skip_count); tdef tdefs[] = { {"part.tbl", "part table", 200000, - pr_part, sd_part, PSUPP, 0}, + (int (*)(void *, int))pr_part, sd_part, PSUPP, 0}, {"partsupp.tbl", "partsupplier table", 200000, - pr_psupp, sd_psupp, NONE, 0}, + (int (*)(void *, int))pr_psupp, sd_psupp, NONE, 0}, {"supplier.tbl", "suppliers table", 10000, - pr_supp, sd_supp, NONE, 0}, + (int (*)(void *, int))pr_supp, sd_supp, NONE, 0}, {"customer.tbl", "customers table", 150000, - pr_cust, sd_cust, NONE, 0}, + (int (*)(void *, int))pr_cust, sd_cust, NONE, 0}, {"orders.tbl", "order table", 150000, - pr_order, sd_order, LINE, 0}, + (int (*)(void *, int))pr_order, sd_order, LINE, 0}, {"lineitem.tbl", "lineitem table", 150000, - pr_line, sd_line, NONE, 0}, + (int (*)(void *, int))pr_line, sd_line, NONE, 0}, {"orders.tbl", "orders/lineitem tables", 150000, - pr_order_line, sd_order, LINE, 0}, + (int (*)(void *, int))pr_order_line, sd_order, LINE, 0}, {"part.tbl", "part/partsupplier tables", 200000, - pr_part_psupp, sd_part, PSUPP, 0}, + (int (*)(void *, int))pr_part_psupp, sd_part, PSUPP, 0}, {"nation.tbl", "nation table", NATIONS_MAX, - pr_nation, NO_LFUNC, NONE, 0}, + (int (*)(void *, int))pr_nation, no_lfunc, NONE, 0}, {"region.tbl", "region table", NATIONS_MAX, - pr_region, NO_LFUNC, NONE, 0}, + (int (*)(void *, int))pr_region, no_lfunc, NONE, 0}, }; /* diff --git a/tpch-dbgen/dss.h b/tpch-dbgen/dss.h index 36af7f9..d7046b9 100644 --- a/tpch-dbgen/dss.h +++ b/tpch-dbgen/dss.h @@ -177,8 +177,8 @@ typedef struct char *name; char *comment; DSS_HUGE base; - int (*loader) (); - long (*gen_seed)(); + int (*loader) (void*, int); + long (*gen_seed)(int, long long int); int child; DSS_HUGE vtotal; } tdef;