Annotation of /trunk/meanwhile/patches/meanwhile-1.0.2-fix-glib-headers.patch
Parent Directory | Revision Log
Revision 1787 -
(hide annotations)
(download)
Tue May 22 14:22:29 2012 UTC (12 years, 1 month ago) by niro
File size: 7159 byte(s)
Tue May 22 14:22:29 2012 UTC (12 years, 1 month ago) by niro
File size: 7159 byte(s)
-fix build with newer glib
1 | niro | 1787 | Index: meanwhile-1.1.0/samples/logging_proxy.c |
2 | =================================================================== | ||
3 | --- meanwhile-1.1.0.orig/samples/logging_proxy.c | ||
4 | +++ meanwhile-1.1.0/samples/logging_proxy.c | ||
5 | @@ -25,7 +25,6 @@ | ||
6 | #include <unistd.h> | ||
7 | |||
8 | #include <glib.h> | ||
9 | -#include <glib/glist.h> | ||
10 | |||
11 | #include <mw_cipher.h> | ||
12 | #include <mw_common.h> | ||
13 | Index: meanwhile-1.1.0/samples/login_server.c | ||
14 | =================================================================== | ||
15 | --- meanwhile-1.1.0.orig/samples/login_server.c | ||
16 | +++ meanwhile-1.1.0/samples/login_server.c | ||
17 | @@ -19,7 +19,6 @@ | ||
18 | #include <unistd.h> | ||
19 | |||
20 | #include <glib.h> | ||
21 | -#include <glib/glist.h> | ||
22 | |||
23 | #include <mw_cipher.h> | ||
24 | #include <mw_common.h> | ||
25 | Index: meanwhile-1.1.0/samples/nocipher_proxy.c | ||
26 | =================================================================== | ||
27 | --- meanwhile-1.1.0.orig/samples/nocipher_proxy.c | ||
28 | +++ meanwhile-1.1.0/samples/nocipher_proxy.c | ||
29 | @@ -29,7 +29,6 @@ | ||
30 | #include <unistd.h> | ||
31 | |||
32 | #include <glib.h> | ||
33 | -#include <glib/glist.h> | ||
34 | |||
35 | #include <mw_common.h> | ||
36 | #include <mw_message.h> | ||
37 | Index: meanwhile-1.1.0/samples/redirect_server.c | ||
38 | =================================================================== | ||
39 | --- meanwhile-1.1.0.orig/samples/redirect_server.c | ||
40 | +++ meanwhile-1.1.0/samples/redirect_server.c | ||
41 | @@ -22,7 +22,6 @@ | ||
42 | #include <unistd.h> | ||
43 | |||
44 | #include <glib.h> | ||
45 | -#include <glib/glist.h> | ||
46 | |||
47 | #include <mw_common.h> | ||
48 | #include <mw_message.h> | ||
49 | Index: meanwhile-1.1.0/src/channel.c | ||
50 | =================================================================== | ||
51 | --- meanwhile-1.1.0.orig/src/channel.c | ||
52 | +++ meanwhile-1.1.0/src/channel.c | ||
53 | @@ -19,8 +19,6 @@ | ||
54 | */ | ||
55 | |||
56 | #include <glib.h> | ||
57 | -#include <glib/ghash.h> | ||
58 | -#include <glib/glist.h> | ||
59 | #include <string.h> | ||
60 | |||
61 | #include "mw_channel.h" | ||
62 | Index: meanwhile-1.1.0/src/mw_debug.c | ||
63 | =================================================================== | ||
64 | --- meanwhile-1.1.0.orig/src/mw_debug.c | ||
65 | +++ meanwhile-1.1.0/src/mw_debug.c | ||
66 | @@ -19,7 +19,7 @@ | ||
67 | */ | ||
68 | |||
69 | |||
70 | -#include <glib/gstring.h> | ||
71 | +#include <glib.h> | ||
72 | |||
73 | #include "mw_debug.h" | ||
74 | |||
75 | Index: meanwhile-1.1.0/src/mw_message.h | ||
76 | =================================================================== | ||
77 | --- meanwhile-1.1.0.orig/src/mw_message.h | ||
78 | +++ meanwhile-1.1.0/src/mw_message.h | ||
79 | @@ -22,7 +22,7 @@ | ||
80 | #define _MW_MESSAGE_H | ||
81 | |||
82 | |||
83 | -#include <glib/glist.h> | ||
84 | +#include <glib.h> | ||
85 | #include "mw_common.h" | ||
86 | |||
87 | |||
88 | Index: meanwhile-1.1.0/src/mw_srvc_conf.h | ||
89 | =================================================================== | ||
90 | --- meanwhile-1.1.0.orig/src/mw_srvc_conf.h | ||
91 | +++ meanwhile-1.1.0/src/mw_srvc_conf.h | ||
92 | @@ -22,7 +22,7 @@ | ||
93 | #define _MW_SRVC_CONF_H | ||
94 | |||
95 | |||
96 | -#include <glib/glist.h> | ||
97 | +#include <glib.h> | ||
98 | #include "mw_common.h" | ||
99 | |||
100 | |||
101 | Index: meanwhile-1.1.0/src/mw_srvc_dir.h | ||
102 | =================================================================== | ||
103 | --- meanwhile-1.1.0.orig/src/mw_srvc_dir.h | ||
104 | +++ meanwhile-1.1.0/src/mw_srvc_dir.h | ||
105 | @@ -22,7 +22,6 @@ | ||
106 | |||
107 | |||
108 | #include <glib.h> | ||
109 | -#include <glib/glist.h> | ||
110 | |||
111 | |||
112 | #ifdef __cplusplus | ||
113 | Index: meanwhile-1.1.0/src/mw_srvc_place.h | ||
114 | =================================================================== | ||
115 | --- meanwhile-1.1.0.orig/src/mw_srvc_place.h | ||
116 | +++ meanwhile-1.1.0/src/mw_srvc_place.h | ||
117 | @@ -22,7 +22,7 @@ | ||
118 | #define _MW_SRVC_PLACE_H | ||
119 | |||
120 | |||
121 | -#include <glib/glist.h> | ||
122 | +#include <glib.h> | ||
123 | #include "mw_common.h" | ||
124 | |||
125 | |||
126 | Index: meanwhile-1.1.0/src/mw_srvc_resolve.h | ||
127 | =================================================================== | ||
128 | --- meanwhile-1.1.0.orig/src/mw_srvc_resolve.h | ||
129 | +++ meanwhile-1.1.0/src/mw_srvc_resolve.h | ||
130 | @@ -23,7 +23,6 @@ | ||
131 | |||
132 | |||
133 | #include <glib.h> | ||
134 | -#include <glib/glist.h> | ||
135 | |||
136 | |||
137 | #ifdef __cplusplus | ||
138 | Index: meanwhile-1.1.0/src/mw_st_list.h | ||
139 | =================================================================== | ||
140 | --- meanwhile-1.1.0.orig/src/mw_st_list.h | ||
141 | +++ meanwhile-1.1.0/src/mw_st_list.h | ||
142 | @@ -30,7 +30,6 @@ | ||
143 | |||
144 | |||
145 | #include <glib.h> | ||
146 | -#include <glib/glist.h> | ||
147 | #include "mw_common.h" | ||
148 | |||
149 | |||
150 | Index: meanwhile-1.1.0/src/mw_util.h | ||
151 | =================================================================== | ||
152 | --- meanwhile-1.1.0.orig/src/mw_util.h | ||
153 | +++ meanwhile-1.1.0/src/mw_util.h | ||
154 | @@ -23,9 +23,6 @@ | ||
155 | |||
156 | |||
157 | #include <glib.h> | ||
158 | -#include <glib/ghash.h> | ||
159 | -#include <glib/glist.h> | ||
160 | - | ||
161 | |||
162 | #define map_guint_new() \ | ||
163 | g_hash_table_new(g_direct_hash, g_direct_equal) | ||
164 | Index: meanwhile-1.1.0/src/srvc_aware.c | ||
165 | =================================================================== | ||
166 | --- meanwhile-1.1.0.orig/src/srvc_aware.c | ||
167 | +++ meanwhile-1.1.0/src/srvc_aware.c | ||
168 | @@ -19,8 +19,6 @@ | ||
169 | */ | ||
170 | |||
171 | #include <glib.h> | ||
172 | -#include <glib/ghash.h> | ||
173 | -#include <glib/glist.h> | ||
174 | #include <string.h> | ||
175 | |||
176 | #include "mw_channel.h" | ||
177 | Index: meanwhile-1.1.0/src/srvc_conf.c | ||
178 | =================================================================== | ||
179 | --- meanwhile-1.1.0.orig/src/srvc_conf.c | ||
180 | +++ meanwhile-1.1.0/src/srvc_conf.c | ||
181 | @@ -19,8 +19,6 @@ | ||
182 | */ | ||
183 | |||
184 | #include <glib.h> | ||
185 | -#include <glib/ghash.h> | ||
186 | -#include <glib/glist.h> | ||
187 | |||
188 | #include <stdio.h> | ||
189 | #include <stdlib.h> | ||
190 | Index: meanwhile-1.1.0/src/srvc_dir.c | ||
191 | =================================================================== | ||
192 | --- meanwhile-1.1.0.orig/src/srvc_dir.c | ||
193 | +++ meanwhile-1.1.0/src/srvc_dir.c | ||
194 | @@ -18,7 +18,7 @@ | ||
195 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
196 | */ | ||
197 | |||
198 | -#include <glib/ghash.h> | ||
199 | +#include <glib.h> | ||
200 | |||
201 | #include "mw_channel.h" | ||
202 | #include "mw_common.h" | ||
203 | Index: meanwhile-1.1.0/src/srvc_ft.c | ||
204 | =================================================================== | ||
205 | --- meanwhile-1.1.0.orig/src/srvc_ft.c | ||
206 | +++ meanwhile-1.1.0/src/srvc_ft.c | ||
207 | @@ -19,7 +19,7 @@ | ||
208 | */ | ||
209 | |||
210 | |||
211 | -#include <glib/glist.h> | ||
212 | +#include <glib.h> | ||
213 | |||
214 | #include "mw_channel.h" | ||
215 | #include "mw_common.h" | ||
216 | Index: meanwhile-1.1.0/src/srvc_im.c | ||
217 | =================================================================== | ||
218 | --- meanwhile-1.1.0.orig/src/srvc_im.c | ||
219 | +++ meanwhile-1.1.0/src/srvc_im.c | ||
220 | @@ -19,7 +19,6 @@ | ||
221 | */ | ||
222 | |||
223 | #include <glib.h> | ||
224 | -#include <glib/glist.h> | ||
225 | #include <string.h> | ||
226 | |||
227 | #include "mw_channel.h" | ||
228 | Index: meanwhile-1.1.0/src/srvc_place.c | ||
229 | =================================================================== | ||
230 | --- meanwhile-1.1.0.orig/src/srvc_place.c | ||
231 | +++ meanwhile-1.1.0/src/srvc_place.c | ||
232 | @@ -19,8 +19,6 @@ | ||
233 | */ | ||
234 | |||
235 | #include <glib.h> | ||
236 | -#include <glib/ghash.h> | ||
237 | -#include <glib/glist.h> | ||
238 | |||
239 | #include <stdio.h> | ||
240 | #include <stdlib.h> | ||
241 | Index: meanwhile-1.1.0/src/srvc_resolve.c | ||
242 | =================================================================== | ||
243 | --- meanwhile-1.1.0.orig/src/srvc_resolve.c | ||
244 | +++ meanwhile-1.1.0/src/srvc_resolve.c | ||
245 | @@ -18,7 +18,7 @@ | ||
246 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
247 | */ | ||
248 | |||
249 | -#include <glib/ghash.h> | ||
250 | +#include <glib.h> | ||
251 | |||
252 | #include "mw_channel.h" | ||
253 | #include "mw_common.h" | ||
254 | Index: meanwhile-1.1.0/src/srvc_store.c | ||
255 | =================================================================== | ||
256 | --- meanwhile-1.1.0.orig/src/srvc_store.c | ||
257 | +++ meanwhile-1.1.0/src/srvc_store.c | ||
258 | @@ -18,7 +18,7 @@ | ||
259 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
260 | */ | ||
261 | |||
262 | -#include <glib/glist.h> | ||
263 | +#include <glib.h> | ||
264 | |||
265 | #include "mw_channel.h" | ||
266 | #include "mw_debug.h" | ||
267 | Index: meanwhile-1.1.0/src/st_list.c | ||
268 | =================================================================== | ||
269 | --- meanwhile-1.1.0.orig/src/st_list.c | ||
270 | +++ meanwhile-1.1.0/src/st_list.c | ||
271 | @@ -20,7 +20,7 @@ | ||
272 | |||
273 | #include <stdio.h> | ||
274 | #include <string.h> | ||
275 | -#include <glib/gstring.h> | ||
276 | +#include <glib.h> | ||
277 | |||
278 | #include "mw_debug.h" | ||
279 | #include "mw_util.h" |