]>
Commit | Line | Data |
---|---|---|
fa563337 JR |
1 | diff -ur rpm-5.4.10.orig/rpmio/argv.h rpm-5.4.10/rpmio/argv.h |
2 | --- rpm-5.4.10.orig/rpmio/argv.h 2012-09-09 13:54:22.000000000 +0200 | |
3 | +++ rpm-5.4.10/rpmio/argv.h 2012-09-09 14:43:55.765933246 +0200 | |
4 | @@ -1,6 +1,8 @@ | |
5 | #ifndef _H_ARGV_ | |
6 | #define _H_ARGV_ | |
7 | ||
8 | +#include <stdio.h> /* XXX FILE * typedef */ | |
9 | + | |
10 | /** \ingroup rpmio | |
11 | * \file rpmio/argv.h | |
12 | */ | |
13 | diff -ur rpm-5.4.10.orig/rpmdb/pkgio.h rpm-5.4.10/rpmdb/pkgio.h | |
14 | --- rpm-5.4.10.orig/rpmdb/pkgio.h 2012-09-09 13:54:22.000000000 +0200 | |
15 | +++ rpm-5.4.10/rpmdb/pkgio.h 2012-09-09 14:49:38.112587836 +0200 | |
16 | @@ -6,6 +6,8 @@ | |
17 | * Methods to handle package elements. | |
18 | */ | |
19 | ||
20 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
21 | +#include <rpmtypes.h> | |
22 | #include <rpmio.h> /* XXX FD_t typedef */ | |
23 | #include <rpmpgp.h> /* XXX pgpDig typedef */ | |
24 | #include <rpmtag.h> /* XXX Header typedef */ | |
25 | diff -ur rpm-5.4.10.orig/lib/rpm46compat.h rpm-5.4.10/lib/rpm46compat.h | |
26 | --- rpm-5.4.10.orig/lib/rpm46compat.h 2012-09-09 13:54:23.000000000 +0200 | |
27 | +++ rpm-5.4.10/lib/rpm46compat.h 2012-09-09 14:25:02.645973220 +0200 | |
28 | @@ -7,6 +7,7 @@ | |
29 | #ifndef H_RPM46COMPAT | |
30 | #define H_RPM46COMPAT 1 | |
31 | ||
32 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
33 | #include <rpm/rpm4compat.h> | |
34 | #include <rpmbuild.h> | |
35 | ||
36 | diff -ur rpm-5.4.10.orig/lib/rpm4compat.h rpm-5.4.10/lib/rpm4compat.h | |
37 | --- rpm-5.4.10.orig/lib/rpm4compat.h 2012-09-09 13:54:23.000000000 +0200 | |
38 | +++ rpm-5.4.10/lib/rpm4compat.h 2012-09-09 14:25:12.069306220 +0200 | |
39 | @@ -42,6 +42,7 @@ | |
40 | #include <unistd.h> | |
41 | #include <stdio.h> | |
42 | #include <errno.h> | |
43 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
44 | ||
45 | #define WITH_DB | |
46 | #define _RPMDB_INTERNAL | |
47 | diff -ur rpm-5.4.10.orig/rpmio/rpmbf.h rpm-5.4.10/rpmio/rpmbf.h | |
48 | --- rpm-5.4.10.orig/rpmio/rpmbf.h 2012-09-09 13:54:22.000000000 +0200 | |
49 | +++ rpm-5.4.10/rpmio/rpmbf.h 2012-09-09 14:27:36.982634442 +0200 | |
50 | @@ -1,6 +1,8 @@ | |
51 | #ifndef H_RPMBF | |
52 | #define H_RPMBF | |
53 | ||
54 | +#include <sys/types.h> /* XXX size_t typedef */ | |
55 | + | |
56 | /** \ingroup rpmio | |
57 | * \file rpmio/rpmbf.h | |
58 | */ | |
59 | diff -ur rpm-5.4.10.orig/build/rpmbuild.h rpm-5.4.10/build/rpmbuild.h | |
60 | --- rpm-5.4.10.orig/build/rpmbuild.h 2012-09-09 13:54:23.000000000 +0200 | |
61 | +++ rpm-5.4.10/build/rpmbuild.h 2012-09-09 14:38:45.262610867 +0200 | |
62 | @@ -7,6 +7,7 @@ | |
63 | */ | |
64 | ||
65 | #include <rpmiotypes.h> | |
66 | +#include <rpmio.h> /* XXX FD_t typedef */ | |
67 | #include <rpmmacro.h> | |
68 | #include <rpmtypes.h> | |
69 | #include <rpmtag.h> | |
70 | diff -ur rpm-5.4.10.orig/lib/rpmcli.h rpm-5.4.10/lib/rpmcli.h | |
71 | --- rpm-5.4.10.orig/lib/rpmcli.h 2012-09-09 13:54:23.000000000 +0200 | |
72 | +++ rpm-5.4.10/lib/rpmcli.h 2012-09-09 14:25:48.149304946 +0200 | |
73 | @@ -5,6 +5,7 @@ | |
74 | * \file lib/rpmcli.h | |
75 | */ | |
76 | ||
77 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
78 | #include <popt.h> | |
79 | #include <rpmmacro.h> | |
80 | #include <rpmtypes.h> | |
81 | diff -ur rpm-5.4.10.orig/rpmconstant/rpmconstant.h rpm-5.4.10/rpmconstant/rpmconstant.h | |
82 | --- rpm-5.4.10.orig/rpmconstant/rpmconstant.h 2012-09-09 13:54:24.000000000 +0200 | |
83 | +++ rpm-5.4.10/rpmconstant/rpmconstant.h 2012-09-09 14:25:56.589304650 +0200 | |
84 | @@ -18,6 +18,8 @@ | |
85 | * | |
86 | */ | |
87 | ||
88 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
89 | + | |
90 | #include <rpmio.h> | |
91 | #include <rpmiotypes.h> /* XXX fnpyKey */ | |
92 | #include <rpmpgp.h> | |
93 | diff -ur rpm-5.4.10.orig/rpmdb/rpmdb.h rpm-5.4.10/rpmdb/rpmdb.h | |
94 | --- rpm-5.4.10.orig/rpmdb/rpmdb.h 2012-09-09 13:54:22.000000000 +0200 | |
95 | +++ rpm-5.4.10/rpmdb/rpmdb.h 2012-09-09 14:26:05.802637657 +0200 | |
96 | @@ -7,6 +7,7 @@ | |
97 | * Access RPM indices using Berkeley DB interface(s). | |
98 | */ | |
99 | ||
100 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
101 | #include <assert.h> | |
102 | #include <mire.h> | |
103 | ||
104 | diff -ur rpm-5.4.10.orig/lib/rpmds.h rpm-5.4.10/lib/rpmds.h | |
105 | --- rpm-5.4.10.orig/lib/rpmds.h 2012-09-09 13:54:23.000000000 +0200 | |
106 | +++ rpm-5.4.10/lib/rpmds.h 2012-09-09 15:30:02.718364975 +0200 | |
107 | @@ -6,7 +6,12 @@ | |
108 | * Structure(s) used for dependency tag sets. | |
109 | */ | |
110 | ||
111 | +#include <stdio.h> /* XXX FILE * typedef */ | |
112 | +#include <sys/types.h> /* XXX size_t typedef */ | |
113 | +#include <rpmtypes.h> | |
114 | +#include <rpmiotypes.h> | |
115 | #include <rpmevr.h> | |
116 | +#include <rpmtag.h> | |
117 | #define _RPMNS_INTERNAL | |
118 | #include <rpmns.h> | |
119 | #include <rpmps.h> | |
120 | diff -ur rpm-5.4.10.orig/rpmdb/rpmevr.h rpm-5.4.10/rpmdb/rpmevr.h | |
121 | --- rpm-5.4.10.orig/rpmdb/rpmevr.h 2012-09-09 13:54:22.000000000 +0200 | |
122 | +++ rpm-5.4.10/rpmdb/rpmevr.h 2012-09-09 14:39:25.295942787 +0200 | |
123 | @@ -1,6 +1,8 @@ | |
124 | #ifndef H_RPMEVR | |
125 | #define H_RPMEVR | |
126 | ||
127 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
128 | + | |
129 | /** \ingroup rpmds | |
130 | * \file lib/rpmevr.h | |
131 | * Structure(s) and routine(s) used for EVR parsing and comparison. | |
132 | diff -ur rpm-5.4.10.orig/lib/rpmfi.h rpm-5.4.10/lib/rpmfi.h | |
133 | --- rpm-5.4.10.orig/lib/rpmfi.h 2012-09-09 13:54:23.000000000 +0200 | |
134 | +++ rpm-5.4.10/lib/rpmfi.h 2012-09-09 15:32:47.761692486 +0200 | |
135 | @@ -1,6 +1,11 @@ | |
136 | #ifndef H_RPMFI | |
137 | #define H_RPMFI | |
138 | ||
139 | +#include <sys/types.h> /* XXX size_t typedef */ | |
140 | +#include <rpmtypes.h> | |
141 | +#include <rpmiotypes.h> | |
142 | +#include <rpmtag.h> | |
143 | + | |
144 | /** \ingroup rpmfi | |
145 | * \file lib/rpmfi.h | |
146 | * Structure(s) used for file info tag sets. | |
147 | diff -ur rpm-5.4.10.orig/lib/rpmgi.h rpm-5.4.10/lib/rpmgi.h | |
148 | --- rpm-5.4.10.orig/lib/rpmgi.h 2012-09-09 13:54:23.000000000 +0200 | |
149 | +++ rpm-5.4.10/lib/rpmgi.h 2012-09-09 15:31:45.738361341 +0200 | |
150 | @@ -8,9 +8,12 @@ | |
151 | #include <fts.h> | |
152 | #include <argv.h> | |
153 | #include <rpmtypes.h> | |
154 | +#include <rpmiotypes.h> | |
155 | #include <rpmds.h> | |
156 | #include <rpmte.h> | |
157 | #include <rpmts.h> | |
158 | +#include <rpmtag.h> | |
159 | +#include <rpmio.h> /* XXX FD_t typedef */ | |
160 | ||
161 | /** | |
162 | */ | |
163 | diff -ur rpm-5.4.10.orig/rpmio/rpmiotypes.h rpm-5.4.10/rpmio/rpmiotypes.h | |
164 | --- rpm-5.4.10.orig/rpmio/rpmiotypes.h 2012-09-09 13:54:22.000000000 +0200 | |
165 | +++ rpm-5.4.10/rpmio/rpmiotypes.h 2012-09-09 14:27:26.585968142 +0200 | |
166 | @@ -1,6 +1,9 @@ | |
167 | #ifndef _H_RPMIOTYPES_ | |
168 | #define _H_RPMIOTYPES_ | |
169 | ||
170 | +#include <stdlib.h> /* XXX NULL typedef */ | |
171 | +#include <sys/types.h> /* XXX size_t typedef */ | |
172 | + | |
173 | /** \ingroup rpmio | |
174 | * \file rpmio/rpmiotypes.h | |
175 | */ | |
176 | diff -ur rpm-5.4.10.orig/rpmio/rpmmacro.h rpm-5.4.10/rpmio/rpmmacro.h | |
177 | --- rpm-5.4.10.orig/rpmio/rpmmacro.h 2012-09-09 13:54:22.000000000 +0200 | |
178 | +++ rpm-5.4.10/rpmio/rpmmacro.h 2012-09-09 14:29:08.622631207 +0200 | |
179 | @@ -1,6 +1,9 @@ | |
180 | #ifndef _H_MACRO_ | |
181 | #define _H_MACRO_ | |
182 | ||
183 | +#include <stdio.h> /* XXX FILE * typedef */ | |
184 | +#include <sys/types.h> /* XXX size_t typedef */ | |
185 | + | |
186 | /** \ingroup rpmio | |
187 | * \file rpmio/rpmmacro.h | |
188 | */ | |
189 | diff -ur rpm-5.4.10.orig/rpmdb/rpmns.h rpm-5.4.10/rpmdb/rpmns.h | |
190 | --- rpm-5.4.10.orig/rpmdb/rpmns.h 2012-09-09 13:54:22.000000000 +0200 | |
191 | +++ rpm-5.4.10/rpmdb/rpmns.h 2012-09-09 15:33:08.021691772 +0200 | |
192 | @@ -1,6 +1,9 @@ | |
193 | #ifndef H_RPMNS | |
194 | #define H_RPMNS | |
195 | ||
196 | +#include <sys/types.h> /* XXX size_t typedef */ | |
197 | +#include <rpmiotypes.h> | |
198 | + | |
199 | /** \ingroup rpmds | |
200 | * \file lib/rpmns.h | |
201 | * Structure(s) and routine(s) used for classifying and parsing names. | |
202 | diff -ur rpm-5.4.10.orig/lib/rpmps.h rpm-5.4.10/lib/rpmps.h | |
203 | --- rpm-5.4.10.orig/lib/rpmps.h 2012-09-09 13:54:23.000000000 +0200 | |
204 | +++ rpm-5.4.10/lib/rpmps.h 2012-09-09 14:47:02.782593316 +0200 | |
205 | @@ -1,6 +1,9 @@ | |
206 | #ifndef H_RPMPS | |
207 | #define H_RPMPS | |
208 | ||
209 | +#include <stdio.h> /* XXX FILE * typedef */ | |
210 | +#include <rpmiotypes.h> | |
211 | + | |
212 | /** \ingroup rpmps | |
213 | * \file lib/rpmps.h | |
214 | * Structures and prototypes used for an "rpmps" problem set. | |
215 | diff -ur rpm-5.4.10.orig/lib/rpmrc.h rpm-5.4.10/lib/rpmrc.h | |
216 | --- rpm-5.4.10.orig/lib/rpmrc.h 2012-09-09 13:54:23.000000000 +0200 | |
217 | +++ rpm-5.4.10/lib/rpmrc.h 2012-09-09 14:28:54.559298370 +0200 | |
218 | @@ -1,6 +1,8 @@ | |
219 | #ifndef H_RPMRC | |
220 | #define H_RPMRC | |
221 | ||
222 | +#include <stdio.h> /* XXX FILE * typedef */ | |
223 | + | |
224 | /** | |
225 | * \file lib/rpmrc.h | |
226 | */ | |
227 | diff -ur rpm-5.4.10.orig/build/rpmspec.h rpm-5.4.10/build/rpmspec.h | |
228 | --- rpm-5.4.10.orig/build/rpmspec.h 2012-09-09 13:54:23.000000000 +0200 | |
229 | +++ rpm-5.4.10/build/rpmspec.h 2012-09-09 15:33:14.861691530 +0200 | |
230 | @@ -6,9 +6,14 @@ | |
231 | * The Spec and Package data structures used during build. | |
232 | */ | |
233 | ||
234 | +#include <sys/types.h> /* XXX size_t typedef */ | |
235 | +#include <rpmtypes.h> | |
236 | +#include <rpmiotypes.h> | |
237 | #include <rpmevr.h> | |
238 | #include <rpmfi.h> /* XXX rpmfi typedef */ | |
239 | #include <rpmcli.h> /* XXX QVA_t typedef */ | |
240 | +#include <rpmtag.h> | |
241 | +#include <rpmio.h> /* XXX FD_t typedef */ | |
242 | ||
243 | /** \ingroup rpmbuild | |
244 | */ | |
245 | diff -ur rpm-5.4.10.orig/rpmio/rpmsw.h rpm-5.4.10/rpmio/rpmsw.h | |
246 | --- rpm-5.4.10.orig/rpmio/rpmsw.h 2012-09-09 13:54:22.000000000 +0200 | |
247 | +++ rpm-5.4.10/rpmio/rpmsw.h 2012-09-09 15:35:35.208353246 +0200 | |
248 | @@ -1,6 +1,9 @@ | |
249 | #ifndef H_RPMSW | |
250 | #define H_RPMSW | |
251 | ||
252 | +#include <stdio.h> /* XXX FILE * typedef */ | |
253 | +#include <sys/time.h> /* XXX struct timeval typedef */ | |
254 | + | |
255 | /** \ingroup rpmio | |
256 | * \file rpmio/rpmsw.h | |
257 | */ | |
258 | diff -ur rpm-5.4.10.orig/rpmdb/rpmtag.h rpm-5.4.10/rpmdb/rpmtag.h | |
259 | --- rpm-5.4.10.orig/rpmdb/rpmtag.h 2012-09-09 13:54:22.000000000 +0200 | |
260 | +++ rpm-5.4.10/rpmdb/rpmtag.h 2012-09-09 14:26:15.429303984 +0200 | |
261 | @@ -5,6 +5,7 @@ | |
262 | * \file rpmdb/rpmtag.h | |
263 | */ | |
264 | ||
265 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
266 | #include <rpmiotypes.h> | |
267 | #include <rpmsw.h> | |
268 | ||
269 | diff -ur rpm-5.4.10.orig/lib/rpmte.h rpm-5.4.10/lib/rpmte.h | |
270 | --- rpm-5.4.10.orig/lib/rpmte.h 2012-09-09 13:54:23.000000000 +0200 | |
271 | +++ rpm-5.4.10/lib/rpmte.h 2012-09-09 15:32:00.408360824 +0200 | |
272 | @@ -5,7 +5,13 @@ | |
273 | * \file lib/rpmte.h | |
274 | * Structures used for an "rpmte" transaction element. | |
275 | */ | |
276 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
277 | +#include <sys/types.h> /* XXX size_t typedef */ | |
278 | +#include <rpmtypes.h> | |
279 | +#include <rpmiotypes.h> | |
280 | #include <rpmfi.h> | |
281 | +#include <rpmtag.h> | |
282 | +#include <rpmio.h> /* XXX FD_t typedef */ | |
283 | ||
284 | /** | |
285 | */ | |
286 | diff -ur rpm-5.4.10.orig/lib/rpmts.h rpm-5.4.10/lib/rpmts.h | |
287 | --- rpm-5.4.10.orig/lib/rpmts.h 2012-09-09 13:54:23.000000000 +0200 | |
288 | +++ rpm-5.4.10/lib/rpmts.h 2012-09-09 15:30:53.381696521 +0200 | |
289 | @@ -6,9 +6,14 @@ | |
290 | * Structures and prototypes used for an "rpmts" transaction set. | |
291 | */ | |
292 | ||
293 | -#include "rpmps.h" | |
294 | -#include "rpmsw.h" | |
295 | +#include <stdio.h> /* XXX FILE * typedef */ | |
296 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
297 | +#include <rpmtypes.h> | |
298 | +#include <rpmiotypes.h> | |
299 | +#include <rpmps.h> | |
300 | +#include <rpmsw.h> | |
301 | #include <rpmpgp.h> /* XXX pgpVSFlags */ | |
302 | +#include <rpmtag.h> | |
303 | #if defined(_RPMTS_INTERNAL) | |
304 | #include <rpmbag.h> | |
305 | #endif | |
306 | diff -ur rpm-5.4.10.orig/lib/rpmversion.h rpm-5.4.10/lib/rpmversion.h | |
307 | --- rpm-5.4.10.orig/lib/rpmversion.h 2012-09-09 13:54:23.000000000 +0200 | |
308 | +++ rpm-5.4.10/lib/rpmversion.h 2012-09-09 14:29:18.352630865 +0200 | |
309 | @@ -1,6 +1,8 @@ | |
310 | #ifndef __RPMVERSION_H__ | |
311 | #define __RPMVERSION_H__ | |
312 | ||
313 | +#include <stdint.h> /* XXX unint32_t typedef */ | |
314 | + | |
315 | #ifdef __cplusplus | |
316 | extern "C" { | |
317 | #endif | |
318 | diff -ur rpm-5.4.10.orig/rpmio/rpmzlog.h rpm-5.4.10/rpmio/rpmzlog.h | |
319 | --- rpm-5.4.10.orig/rpmio/rpmzlog.h 2012-09-09 13:54:22.000000000 +0200 | |
320 | +++ rpm-5.4.10/rpmio/rpmzlog.h 2012-09-09 14:29:32.625963694 +0200 | |
321 | @@ -4,6 +4,7 @@ | |
322 | /** \ingroup rpmio | |
323 | * \file rpmio/rpmzlog.h | |
324 | */ | |
325 | +#include <stdio.h> /* XXX FILE * typedef */ | |
326 | #include <sys/time.h> | |
327 | ||
328 | /** trace log pointer */ | |
329 | diff -ur rpm-5.4.10.orig/rpmio/yarn.h rpm-5.4.10/rpmio/yarn.h | |
330 | --- rpm-5.4.10.orig/rpmio/yarn.h 2012-09-09 13:54:22.000000000 +0200 | |
331 | +++ rpm-5.4.10/rpmio/yarn.h 2012-09-09 15:37:09.928349906 +0200 | |
332 | @@ -111,6 +111,9 @@ | |
333 | handler will exit (set to NULL by default for no action) | |
334 | */ | |
335 | ||
336 | +#include <sys/types.h> /* XXX size_t typedef */ | |
337 | +#include <rpmiotypes.h> /* XXX yarnLock typedef */ | |
338 | + | |
339 | #ifdef __cplusplus | |
340 | extern "C" { | |
341 | #endif |