1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Author: Andreas Beckmann <anbe@debian.org>
Description: fix building with GCC 15
--- a/juman/server.c
+++ b/juman/server.c
@@ -452,8 +452,8 @@ static int do_cmd(line)
" -b show best path (default)\n",
" -B show best path including homographs\n",
" -m show all morphemes\n",
- " -p show all pathes\n",
- " -P show all pathes by -B style\n",
+ " -p show all paths\n",
+ " -P show all paths by -B style\n",
"\n",
" -f show formatted morpheme data (default)\n",
" -c show coded morpheme data\n",
@@ -462,7 +462,7 @@ static int do_cmd(line)
" -E -e plus location and semantics data\n",
"\n",
" -u disable unknown word processing\n",
- " -i ignore an input line startig with 'string'\n",
+ " -i ignore an input line starting with 'string'\n",
"\n",
"RC\n",
"QUIT\n",
@@ -573,7 +573,7 @@ static void sigchld_handler(sig)
#endif
static int sfd = -1;
-static void sig_term()
+static void sig_term(int)
{
shutdown(client_fd, 2);
shutdown(sfd, 2);
--- a/lib/iotool.c
+++ b/lib/iotool.c
@@ -146,7 +146,7 @@ void change_postfix(char *filename, char
void getpath(char *cur_path, char *juman_path)
{
- char *env, *getenv();
+ char *env;
#ifdef _WIN32
GetCurrentDirectory(FILENAME_MAX,cur_path);
@@ -511,7 +511,7 @@ void set_jumanrc_fileptr(char *option_rc
→ rcfileがなくてもよい
*/
- char *user_home_ptr, *getenv(), filename[FILENAME_MAX];
+ char *user_home_ptr, filename[FILENAME_MAX];
if (option_rcfile) {
if ((Jumanrc_Fileptr = fopen(option_rcfile, "r")) == NULL) {
--- a/makemat/makemat.h
+++ b/makemat/makemat.h
@@ -37,7 +37,7 @@ typedef struct _RENSETU
/* makemat.c */
void read_h_b_k_kankei(FILE *fp);
-void make_rensetu_tbl();
+void make_rensetu_tbl(FILE *);
void _make_rensetu_tbl1(CELL *cell1, int *cnt);
void _make_rensetu_tbl2(int hinsi, int bunrui, int *cnt);
void read_rensetu(FILE *fp);
--- a/makepat/dicsort.c
+++ b/makepat/dicsort.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
#ifdef DEBUG
fprintf(stderr, "sorting\n");
#endif
- qsort(line, nline, sizeof(line_info), (int (*)())midasi_compare);
+ qsort(line, nline, sizeof(line_info), (int (*)(const void *, const void *))midasi_compare);
#ifdef DEBUG
fprintf(stderr, "outputting\n");
|
