tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From 081d9c3284075c65b70837079bd67621c3b64da7 Mon Sep 17 00:00:00 2001
2From: Moraxyc <i@qaq.li>
3Date: Sun, 28 Dec 2025 00:39:49 +0800
4Subject: [PATCH] fix build with c23
5
6---
7 libAfterBase/fs.c | 2 +-
8 src/ASDocGen/ASDocGen.c | 2 +-
9 src/Ident/Ident.c | 2 +-
10 src/afterstep/dirtree.c | 2 +-
11 src/afterstep/menus.h | 2 +-
12 5 files changed, 5 insertions(+), 5 deletions(-)
13
14diff --git a/libAfterBase/fs.c b/libAfterBase/fs.c
15index 731bfd3..954bfd6 100644
16--- a/libAfterBase/fs.c
17+++ b/libAfterBase/fs.c
18@@ -818,7 +818,7 @@ my_scandir (char *dirname, struct direntry *(*namelist[]),
19 }
20 /* Optionally sort the list */
21 if (dcomp)
22- qsort (*namelist, n, sizeof (struct direntry *), (int (*)())dcomp);
23+ qsort (*namelist, n, sizeof (struct direntry *), (int (*)(const void *, const void *))dcomp);
24
25 /* Return the count of the entries */
26 return n;
27diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c
28index 31d7a70..9a86219 100644
29--- a/src/ASDocGen/ASDocGen.c
30+++ b/src/ASDocGen/ASDocGen.c
31@@ -667,7 +667,7 @@ write_options_keywords(const char *source_dir, const char *syntax_dir, SyntaxDef
32 sorted_list = safecalloc( max_i, sizeof(TermDef*));
33 for (i = 0; i < max_i; i++)
34 sorted_list[i] = &(syntax->terms[i]) ;
35- qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)())sort_terms_by_alpha );
36+ qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)(const void *, const void *))sort_terms_by_alpha );
37 for (i = 0; i < max_i; i++)
38 {
39 SyntaxDef *sub_syntax = sorted_list[i]->sub_syntax ;
40diff --git a/src/Ident/Ident.c b/src/Ident/Ident.c
41index 1497d06..d6ddad6 100644
42--- a/src/Ident/Ident.c
43+++ b/src/Ident/Ident.c
44@@ -89,7 +89,7 @@ void HandleEvents();
45 void DispatchEvent (ASEvent * event);
46 void process_message (send_data_type type, send_data_type *body);
47
48-Window make_ident_window();
49+Window make_ident_window(int width, int height);
50 void fill_window_data();
51 void display_window_data();
52 void add_property( const char *name, const char *value, unsigned long value_encoding, Bool span_cols );
53diff --git a/src/afterstep/dirtree.c b/src/afterstep/dirtree.c
54index 46ce782..48f7e30 100644
55--- a/src/afterstep/dirtree.c
56+++ b/src/afterstep/dirtree.c
57@@ -675,7 +675,7 @@ void dirtree_sort (dirtree_t * tree)
58 list = (dirtree_t **) safemalloc (n * sizeof (dirtree_t *));
59 for (n = 0, t = tree->child; t != NULL; t = t->next, n++)
60 list[n] = t;
61- qsort (list, n, sizeof (dirtree_t *), (int (*)())dirtree_compar);
62+ qsort (list, n, sizeof (dirtree_t *), (int (*)(const void *, const void *))dirtree_compar);
63 tree->child = list[0];
64 for (i = 1; i < n; i++)
65 list[i - 1]->next = list[i];
66diff --git a/src/afterstep/menus.h b/src/afterstep/menus.h
67index 98b2ad3..bb2a5b1 100644
68--- a/src/afterstep/menus.h
69+++ b/src/afterstep/menus.h
70@@ -95,7 +95,7 @@ MenuData* FindPopup( const char* name, int quiet );
71
72 void DeleteMenuItem( MenuDataItem* item );
73
74-MenuData *CreateMenuData();
75+MenuData *CreateMenuData(char *name);
76 MenuData *NewMenuData (char *name);
77 void DeleteMenuData (MenuData * menu);
78
79--
802.51.2
81