1 |
jlec 13/03/01 13:15:20 |
2 |
|
3 |
Added: wordnet-3.0-tcl8.6.patch |
4 |
Log: |
5 |
app-dicts/wordnet: Fix compilation gainst tcl-8.6, #451400 |
6 |
|
7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: wordnet-3.0-tcl8.6.patch |
16 |
=================================================================== |
17 |
src/stubs.c | 33 +++++++++++++++++---------------- |
18 |
1 file changed, 17 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/src/stubs.c b/src/stubs.c |
21 |
index 794485c..cec2c04 100644 |
22 |
--- a/src/stubs.c |
23 |
+++ b/src/stubs.c |
24 |
@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp, |
25 |
char *morph; |
26 |
int pos; |
27 |
if (argc != 3) { |
28 |
- interp -> result = |
29 |
- "usage: findvalidsearches searchword partofspeechnum"; |
30 |
+ Tcl_SetResult(interp, |
31 |
+ "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC); |
32 |
return TCL_ERROR; |
33 |
} |
34 |
pos = atoi (argv[2]); |
35 |
@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp, |
36 |
} while ((morph = morphstr (NULL, pos)) != NULL); |
37 |
} |
38 |
sprintf (bitfieldstr, "%u", bitfield); |
39 |
- interp -> result = bitfieldstr; |
40 |
+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC); |
41 |
return TCL_OK; |
42 |
} |
43 |
|
44 |
@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp, |
45 |
static char bitfieldstr[32]; |
46 |
int whichbit; |
47 |
if (argc != 2) { |
48 |
- interp -> result = "usage: bit bitnum"; |
49 |
+ Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC); |
50 |
return TCL_ERROR; |
51 |
} |
52 |
whichbit = atoi (argv[1]); |
53 |
bitfield = bit (whichbit); |
54 |
sprintf (bitfieldstr, "%u", bitfield); |
55 |
- interp -> result = bitfieldstr; |
56 |
+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC); |
57 |
return TCL_OK; |
58 |
} |
59 |
|
60 |
@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp, |
61 |
int pos, searchtype, sense; |
62 |
char *morph; |
63 |
if (argc != 5) { |
64 |
- interp -> result = |
65 |
- "usage: search searchword partofspeechnum searchtypenum sensenum"; |
66 |
+ Tcl_SetResult(interp, |
67 |
+ "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC); |
68 |
return TCL_ERROR; |
69 |
} |
70 |
pos = atoi (argv[2]); |
71 |
@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp, |
72 |
strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense)); |
73 |
} while ((morph = morphstr (NULL, pos)) != NULL); |
74 |
} |
75 |
- interp -> result = resultbuf; |
76 |
+ Tcl_SetResult(interp, resultbuf, TCL_STATIC); |
77 |
return TCL_OK; |
78 |
} |
79 |
|
80 |
@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp, |
81 |
int wn_glosses (ClientData clientData, Tcl_Interp *interp, |
82 |
int argc, char *argv[]) { |
83 |
if (argc != 2) { |
84 |
- interp -> result = "usage: glosses [1 | 0]"; |
85 |
+ Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC); |
86 |
return TCL_ERROR; |
87 |
} |
88 |
dflag = atoi (argv[1]); |
89 |
@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp, |
90 |
int wn_fileinfo (ClientData clientData, Tcl_Interp *interp, |
91 |
int argc, char *argv[]) { |
92 |
if (argc != 2) { |
93 |
- interp -> result = "usage: fileinfo [1 | 0]"; |
94 |
+ Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC); |
95 |
return TCL_ERROR; |
96 |
} |
97 |
fileinfoflag = atoi (argv[1]); |
98 |
@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp, |
99 |
int wn_byteoffset (ClientData clientData, Tcl_Interp *interp, |
100 |
int argc, char *argv[]) { |
101 |
if (argc != 2) { |
102 |
- interp -> result = "usage: byteoffset [1 | 0]"; |
103 |
+ Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC); |
104 |
return TCL_ERROR; |
105 |
} |
106 |
offsetflag = atoi (argv[1]); |
107 |
@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp, |
108 |
int wn_senseflag (ClientData clientData, Tcl_Interp *interp, |
109 |
int argc, char *argv[]) { |
110 |
if (argc != 2) { |
111 |
- interp -> result = "usage: senseflag [1 | 0]"; |
112 |
+ Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC); |
113 |
return TCL_ERROR; |
114 |
} |
115 |
wnsnsflag = atoi (argv[1]); |
116 |
@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp, |
117 |
int argc, char *argv[]) { |
118 |
int pos, searchtype; |
119 |
if (argc != 3) { |
120 |
- interp -> result = "usage: contextualhelp partofspeechnum searchtypenum"; |
121 |
+ Tcl_SetResult(interp, |
122 |
+ "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC); |
123 |
return TCL_ERROR; |
124 |
} |
125 |
pos = atoi (argv[1]); |
126 |
searchtype = atoi (argv[2]); |
127 |
- interp -> result = helptext[pos][searchtype]; |
128 |
+ Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC); |
129 |
return TCL_OK; |
130 |
} |
131 |
|
132 |
@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp, |
133 |
int wn_reopendb (ClientData clientData, Tcl_Interp *interp, |
134 |
int argc, char *argv[]) { |
135 |
if (argc != 1) { |
136 |
- interp -> result = "usage: reopendb"; |
137 |
+ Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC); |
138 |
return TCL_ERROR; |
139 |
} |
140 |
re_wninit (); |
141 |
@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp, |
142 |
int wn_abortsearch (ClientData clientData, Tcl_Interp *interp, |
143 |
int argc, char *argv[]) { |
144 |
if (argc != 1) { |
145 |
- interp -> result = "usage: abortsearch"; |
146 |
+ Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC); |
147 |
return TCL_ERROR; |
148 |
} |
149 |
abortsearch = 1; |