From 6fd28d9e8e8553092d775e9d08df2a7742404ac6 Mon Sep 17 00:00:00 2001 From: Konstantin Sharon Date: Tue, 24 Jun 2025 20:45:23 +0300 Subject: [PATCH 1/2] Fix function pointer type --- thirdparty/espresso/src/cofactor.c | 2 +- thirdparty/espresso/src/compl.c | 4 ++-- thirdparty/espresso/src/espresso.h | 1 + thirdparty/espresso/src/setc.c | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/thirdparty/espresso/src/cofactor.c b/thirdparty/espresso/src/cofactor.c index 63dfa190..de84bcc2 100644 --- a/thirdparty/espresso/src/cofactor.c +++ b/thirdparty/espresso/src/cofactor.c @@ -348,7 +348,7 @@ simplify_cubelist(set **T) set_copy(CUBE.temp[0], T[0]); // retrieve cofactor ncubes = CUBELISTSIZE(T); - qsort((char *) (T+2), ncubes, sizeof(set *), d1_order); + qsort((char *) (T+2), ncubes, sizeof(set *), d1_order_cmp); Tdest = T+2; // *Tdest++ = T[2]; diff --git a/thirdparty/espresso/src/compl.c b/thirdparty/espresso/src/compl.c index ebd73390..61c9a22a 100644 --- a/thirdparty/espresso/src/compl.c +++ b/thirdparty/espresso/src/compl.c @@ -186,8 +186,8 @@ static set_family_t *compl_merge(set **T1, set_family_t *L, set_family_t *R, set /* Sort the arrays for a distance-1 merge */ set_copy(CUBE.temp[0], CUBE.var_mask[var]); - qsort((char *) (L1 = sf_list(L)), L->count, sizeof(set *), d1_order); - qsort((char *) (R1 = sf_list(R)), R->count, sizeof(set *), d1_order); + qsort((char *) (L1 = sf_list(L)), L->count, sizeof(set *), d1_order_cmp); + qsort((char *) (R1 = sf_list(R)), R->count, sizeof(set *), d1_order_cmp); /* Perform distance-1 merge */ compl_d1merge(L1, R1); diff --git a/thirdparty/espresso/src/espresso.h b/thirdparty/espresso/src/espresso.h index 9c72a93d..b847c806 100644 --- a/thirdparty/espresso/src/espresso.h +++ b/thirdparty/espresso/src/espresso.h @@ -538,6 +538,7 @@ int cactive(set *a); int cdist(set *a, set *b); int cdist01(set *a, set *b); int d1_order(set **a, set **b); +int d1_order_cmp(const void *a, const void *b); int desc1(set *a, set *b); int descend(set **a, set **b); int lex_order(set **a, set **b); diff --git a/thirdparty/espresso/src/setc.c b/thirdparty/espresso/src/setc.c index 3e58e8c9..07773fb2 100644 --- a/thirdparty/espresso/src/setc.c +++ b/thirdparty/espresso/src/setc.c @@ -509,6 +509,12 @@ d1_order(set **a, set **b) return 0; } +int +d1_order_cmp(const void *a, const void *b) +{ + return d1_order((set **) a, (set **) b); +} + // desc1 -- comparison (without indirection) for descending sort // also has effect of handling NULL pointers,and a NULL pointer has smallest // order From 868456a4f0815eadfc9acdc697be4ff6e0e1b266 Mon Sep 17 00:00:00 2001 From: Konstantin Sharon Date: Tue, 24 Jun 2025 20:48:30 +0300 Subject: [PATCH 2/2] Update version --- pyeda/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyeda/__init__.py b/pyeda/__init__.py index 6ac34802..9c687012 100644 --- a/pyeda/__init__.py +++ b/pyeda/__init__.py @@ -2,5 +2,5 @@ Python EDA Package """ -__version__ = "0.29.0" +__version__ = "0.30.0"