source: clfs-embedded/patches/uClibc-0.9.30-rc3-flock_fixes-1.patch@ 88b7bb1

Last change on this file since 88b7bb1 was 2567553, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Updated Busybox to 1.12.1.
Patched uClibc so struct flock doesn't get redefined.
  • Property mode set to 100644
File size: 22.3 KB
RevLine 
[2567553]1diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/alpha/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/alpha/bits/fcntl.h
2--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/alpha/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
3+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/alpha/bits/fcntl.h 2008-11-08 10:12:27.000000000 -0500
4@@ -138,6 +138,7 @@
5 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
6 #endif
7
8+#ifndef HAVE_ARCH_STRUCT_FLOCK
9 /* We don't need to support __USE_FILE_OFFSET64. */
10 struct flock
11 {
12@@ -147,7 +148,9 @@
13 __off_t l_len; /* Size of the locked area; zero means until EOF. */
14 __pid_t l_pid; /* Process holding the lock. */
15 };
16+#endif
17
18+#ifndef HAVE_ARCH_STRUCT_FLOCK64
19 #ifdef __USE_LARGEFILE64
20 struct flock64
21 {
22@@ -158,6 +161,7 @@
23 __pid_t l_pid; /* Process holding the lock. */
24 };
25 #endif
26+#endif
27
28
29 /* Define some more compatibility macros to be backward compatible with
30diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/arm/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/arm/bits/fcntl.h
31--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/arm/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
32+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/arm/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
33@@ -143,6 +143,7 @@
34 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
35 #endif
36
37+#ifndef HAVE_ARCH_STRUCT_FLOCK
38 struct flock
39 {
40 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
41@@ -156,7 +157,9 @@
42 #endif
43 __pid_t l_pid; /* Process holding the lock. */
44 };
45+#endif
46
47+#ifndef HAVE_ARCH_STRUCT_FLOCK64
48 #ifdef __USE_LARGEFILE64
49 struct flock64
50 {
51@@ -167,6 +170,7 @@
52 __pid_t l_pid; /* Process holding the lock. */
53 };
54 #endif
55+#endif
56
57 /* Define some more compatibility macros to be backward compatible with
58 BSD systems which did not managed to hide these kernel macros. */
59diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/avr32/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/avr32/bits/fcntl.h
60--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/avr32/bits/fcntl.h 2008-09-17 07:45:37.000000000 -0400
61+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/avr32/bits/fcntl.h 2008-11-08 10:13:35.000000000 -0500
62@@ -124,6 +124,7 @@
63 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
64 #endif
65
66+#ifndef HAVE_ARCH_STRUCT_FLOCK
67 struct flock {
68 short l_type;
69 short l_whence;
70@@ -136,7 +137,9 @@
71 #endif
72 __pid_t l_pid;
73 };
74+#endif
75
76+#ifndef HAVE_ARCH_STRUCT_FLOCK64
77 #ifdef __USE_LARGEFILE64
78 struct flock64 {
79 short l_type;
80@@ -146,6 +149,7 @@
81 __pid_t l_pid;
82 };
83 #endif
84+#endif
85
86 /* Define some more compatibility macros to be backward compatible with
87 * BSD systems which did not managed to hide these kernel macros. */
88diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/bfin/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/bfin/bits/fcntl.h
89--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/bfin/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
90+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/bfin/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
91@@ -139,6 +139,7 @@
92 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
93 #endif
94
95+#ifndef HAVE_ARCH_STRUCT_FLOCK
96 struct flock
97 {
98 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
99@@ -152,7 +153,9 @@
100 #endif
101 __pid_t l_pid; /* Process holding the lock. */
102 };
103+#endif
104
105+#ifndef HAVE_ARCH_STRUCT_FLOCK64
106 #ifdef __USE_LARGEFILE64
107 struct flock64
108 {
109@@ -163,6 +166,7 @@
110 __pid_t l_pid; /* Process holding the lock. */
111 };
112 #endif
113+#endif
114
115 /* Define some more compatibility macros to be backward compatible with
116 BSD systems which did not managed to hide these kernel macros. */
117diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/cris/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/cris/bits/fcntl.h
118--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/cris/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
119+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/cris/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
120@@ -140,6 +140,7 @@
121 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
122 #endif
123
124+#ifndef HAVE_ARCH_STRUCT_FLOCK
125 struct flock
126 {
127 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
128@@ -153,7 +154,9 @@
129 #endif
130 __pid_t l_pid; /* Process holding the lock. */
131 };
132+#endif
133
134+#ifndef HAVE_ARCH_STRUCT_FLOCK64
135 #ifdef __USE_LARGEFILE64
136 struct flock64
137 {
138@@ -164,6 +167,7 @@
139 __pid_t l_pid; /* Process holding the lock. */
140 };
141 #endif
142+#endif
143
144 /* Define some more compatibility macros to be backward compatible with
145 BSD systems which did not managed to hide these kernel macros. */
146diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/e1/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/e1/bits/fcntl.h
147--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/e1/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
148+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/e1/bits/fcntl.h 2008-11-08 10:06:40.000000000 -0500
149@@ -136,6 +136,7 @@
150 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
151 #endif
152
153+#ifndef HAVE_ARCH_STRUCT_FLOCK
154 struct flock
155 {
156 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
157@@ -149,7 +150,9 @@
158 #endif
159 __pid_t l_pid; /* Process holding the lock. */
160 };
161+#endif
162
163+#ifndef HAVE_ARCH_STRUCT_FLOCK64
164 #ifdef __USE_LARGEFILE64
165 struct flock64
166 {
167@@ -160,6 +163,7 @@
168 __pid_t l_pid; /* Process holding the lock. */
169 };
170 #endif
171+#endif
172
173 /* Define some more compatibility macros to be backward compatible with
174 BSD systems which did not managed to hide these kernel macros. */
175diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/frv/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/frv/bits/fcntl.h
176--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/frv/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
177+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/frv/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
178@@ -118,6 +118,7 @@
179 # define LOCK_UN 8 /* remove lock */
180 #endif
181
182+#ifndef HAVE_ARCH_STRUCT_FLOCK
183 struct flock
184 {
185 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
186@@ -131,7 +132,9 @@
187 #endif
188 __pid_t l_pid; /* Process holding the lock. */
189 };
190+#endif
191
192+#ifndef HAVE_ARCH_STRUCT_FLOCK64
193 #ifdef __USE_LARGEFILE64
194 struct flock64
195 {
196@@ -142,6 +145,7 @@
197 __pid_t l_pid; /* Process holding the lock. */
198 };
199 #endif
200+#endif
201
202 /* Define some more compatibility macros to be backward compatible with
203 BSD systems which did not managed to hide these kernel macros. */
204diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/h8300/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/h8300/bits/fcntl.h
205--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/h8300/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
206+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/h8300/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
207@@ -136,6 +136,7 @@
208 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
209 #endif
210
211+#ifndef HAVE_ARCH_STRUCT_FLOCK
212 struct flock
213 {
214 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
215@@ -149,7 +150,9 @@
216 #endif
217 __pid_t l_pid; /* Process holding the lock. */
218 };
219+#endif
220
221+#ifndef HAVE_ARCH_STRUCT_FLOCK64
222 #ifdef __USE_LARGEFILE64
223 struct flock64
224 {
225@@ -160,6 +163,7 @@
226 __pid_t l_pid; /* Process holding the lock. */
227 };
228 #endif
229+#endif
230
231 /* Define some more compatibility macros to be backward compatible with
232 BSD systems which did not managed to hide these kernel macros. */
233diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/hppa/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/hppa/bits/fcntl.h
234--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/hppa/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
235+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/hppa/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
236@@ -130,6 +130,7 @@
237 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
238 #endif
239
240+#ifndef HAVE_ARCH_STRUCT_FLOCK
241 struct flock
242 {
243 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
244@@ -143,7 +144,9 @@
245 #endif
246 __pid_t l_pid; /* Process holding the lock. */
247 };
248+#endif
249
250+#ifndef HAVE_ARCH_STRUCT_FLOCK64
251 #ifdef __USE_LARGEFILE64
252 struct flock64
253 {
254@@ -154,6 +157,7 @@
255 __pid_t l_pid; /* Process holding the lock. */
256 };
257 #endif
258+#endif
259
260 /* Define some more compatibility macros to be backward compatible with
261 BSD systems which did not managed to hide these kernel macros. */
262diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i386/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/i386/bits/fcntl.h
263--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i386/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
264+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/i386/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
265@@ -143,6 +143,7 @@
266 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
267 #endif
268
269+#ifndef HAVE_ARCH_STRUCT_FLOCK
270 struct flock
271 {
272 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
273@@ -156,7 +157,9 @@
274 #endif
275 __pid_t l_pid; /* Process holding the lock. */
276 };
277+#endif
278
279+#ifndef HAVE_ARCH_STRUCT_FLOCK64
280 #ifdef __USE_LARGEFILE64
281 struct flock64
282 {
283@@ -167,6 +170,7 @@
284 __pid_t l_pid; /* Process holding the lock. */
285 };
286 #endif
287+#endif
288
289 /* Define some more compatibility macros to be backward compatible with
290 BSD systems which did not managed to hide these kernel macros. */
291diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i960/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/i960/bits/fcntl.h
292--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/i960/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
293+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/i960/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
294@@ -136,6 +136,7 @@
295 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
296 #endif
297
298+#ifndef HAVE_ARCH_STRUCT_FLOCK
299 struct flock
300 {
301 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
302@@ -149,7 +150,9 @@
303 #endif
304 __pid_t l_pid; /* Process holding the lock. */
305 };
306+#endif
307
308+#ifndef HAVE_ARCH_STRUCT_FLOCK64
309 #ifdef __USE_LARGEFILE64
310 struct flock64
311 {
312@@ -160,6 +163,7 @@
313 __pid_t l_pid; /* Process holding the lock. */
314 };
315 #endif
316+#endif
317
318 /* Define some more compatibility macros to be backward compatible with
319 BSD systems which did not managed to hide these kernel macros. */
320diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/ia64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/ia64/bits/fcntl.h
321--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/ia64/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
322+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/ia64/bits/fcntl.h 2008-11-08 10:11:31.000000000 -0500
323@@ -140,6 +140,7 @@
324 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
325 #endif
326
327+#ifndef HAVE_ARCH_STRUCT_FLOCK
328 /* We don't need to support __USE_FILE_OFFSET64. */
329 struct flock
330 {
331@@ -149,7 +150,9 @@
332 __off_t l_len; /* Size of the locked area; zero means until EOF. */
333 __pid_t l_pid; /* Process holding the lock. */
334 };
335+#endif
336
337+#ifndef HAVE_ARCH_STRUCT_FLOCK64
338 #ifdef __USE_LARGEFILE64
339 struct flock64
340 {
341@@ -160,6 +163,7 @@
342 __pid_t l_pid; /* Process holding the lock. */
343 };
344 #endif
345+#endif
346
347
348 /* Define some more compatibility macros to be backward compatible with
349diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/m68k/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/m68k/bits/fcntl.h
350--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/m68k/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
351+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/m68k/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
352@@ -139,6 +139,7 @@
353 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
354 #endif
355
356+#ifndef HAVE_ARCH_STRUCT_FLOCK
357 struct flock
358 {
359 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
360@@ -152,7 +153,9 @@
361 #endif
362 __pid_t l_pid; /* Process holding the lock. */
363 };
364+#endif
365
366+#ifndef HAVE_ARCH_STRUCT_FLOCK64
367 #ifdef __USE_LARGEFILE64
368 struct flock64
369 {
370@@ -163,6 +166,7 @@
371 __pid_t l_pid; /* Process holding the lock. */
372 };
373 #endif
374+#endif
375
376 /* Define some more compatibility macros to be backward compatible with
377 BSD systems which did not managed to hide these kernel macros. */
378diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/microblaze/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/microblaze/bits/fcntl.h
379--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/microblaze/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
380+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/microblaze/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
381@@ -136,6 +136,7 @@
382 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
383 #endif
384
385+#ifndef HAVE_ARCH_STRUCT_FLOCK
386 struct flock
387 {
388 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
389@@ -149,7 +150,9 @@
390 #endif
391 __pid_t l_pid; /* Process holding the lock. */
392 };
393+#endif
394
395+#ifndef HAVE_ARCH_STRUCT_FLOCK64
396 #ifdef __USE_LARGEFILE64
397 struct flock64
398 {
399@@ -160,6 +163,7 @@
400 __pid_t l_pid; /* Process holding the lock. */
401 };
402 #endif
403+#endif
404
405 /* Define some more compatibility macros to be backward compatible with
406 BSD systems which did not managed to hide these kernel macros. */
407diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/mips/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/mips/bits/fcntl.h
408--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/mips/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
409+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/mips/bits/fcntl.h 2008-11-08 10:12:05.000000000 -0500
410@@ -152,6 +152,7 @@
411 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
412 #endif
413
414+#ifndef HAVE_ARCH_STRUCT_FLOCK
415 struct flock
416 {
417 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
418@@ -176,7 +177,9 @@
419 #endif
420 };
421 typedef struct flock flock_t;
422+#endif
423
424+#ifndef HAVE_ARCH_STRUCT_FLOCK64
425 #ifdef __USE_LARGEFILE64
426 struct flock64
427 {
428@@ -187,6 +190,7 @@
429 __pid_t l_pid; /* Process holding the lock. */
430 };
431 #endif
432+#endif
433
434 /* Define some more compatibility macros to be backward compatible with
435 BSD systems which did not managed to hide these kernel macros. */
436diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/nios/bits/fcntl.h
437--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
438+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/nios/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
439@@ -139,6 +139,7 @@
440 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
441 #endif
442
443+#ifndef HAVE_ARCH_STRUCT_FLOCK
444 struct flock
445 {
446 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
447@@ -152,7 +153,9 @@
448 #endif
449 __pid_t l_pid; /* Process holding the lock. */
450 };
451+#endif
452
453+#ifndef HAVE_ARCH_STRUCT_FLOCK64
454 #ifdef __USE_LARGEFILE64
455 struct flock64
456 {
457@@ -163,6 +166,7 @@
458 __pid_t l_pid; /* Process holding the lock. */
459 };
460 #endif
461+#endif
462
463 /* Define some more compatibility macros to be backward compatible with
464 BSD systems which did not managed to hide these kernel macros. */
465diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios2/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/nios2/bits/fcntl.h
466--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/nios2/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
467+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/nios2/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
468@@ -139,6 +139,7 @@
469 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
470 #endif
471
472+#ifndef HAVE_ARCH_STRUCT_FLOCK
473 struct flock
474 {
475 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
476@@ -152,7 +153,9 @@
477 #endif
478 __pid_t l_pid; /* Process holding the lock. */
479 };
480+#endif
481
482+#ifndef HAVE_ARCH_STRUCT_FLOCK64
483 #ifdef __USE_LARGEFILE64
484 struct flock64
485 {
486@@ -163,6 +166,7 @@
487 __pid_t l_pid; /* Process holding the lock. */
488 };
489 #endif
490+#endif
491
492 /* Define some more compatibility macros to be backward compatible with
493 BSD systems which did not managed to hide these kernel macros. */
494diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sh/bits/fcntl.h
495--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
496+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/sh/bits/fcntl.h 2008-11-08 10:07:07.000000000 -0500
497@@ -143,6 +143,7 @@
498 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
499 #endif
500
501+#ifndef HAVE_ARCH_STRUCT_FLOCK
502 struct flock
503 {
504 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
505@@ -156,7 +157,9 @@
506 #endif
507 __pid_t l_pid; /* Process holding the lock. */
508 };
509+#endif
510
511+#ifndef HAVE_ARCH_STRUCT_FLOCK64
512 #ifdef __USE_LARGEFILE64
513 struct flock64
514 {
515@@ -167,6 +170,7 @@
516 __pid_t l_pid; /* Process holding the lock. */
517 };
518 #endif
519+#endif
520
521 /* Define some more compatibility macros to be backward compatible with
522 BSD systems which did not managed to hide these kernel macros. */
523diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sh64/bits/fcntl.h
524--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sh64/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
525+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/sh64/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
526@@ -118,6 +118,7 @@
527 # define LOCK_UN 8 /* remove lock */
528 #endif
529
530+#ifndef HAVE_ARCH_STRUCT_FLOCK
531 struct flock
532 {
533 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
534@@ -131,7 +132,9 @@
535 #endif
536 __pid_t l_pid; /* Process holding the lock. */
537 };
538+#endif
539
540+#ifndef HAVE_ARCH_STRUCT_FLOCK64
541 #ifdef __USE_LARGEFILE64
542 struct flock64
543 {
544@@ -142,6 +145,7 @@
545 __pid_t l_pid; /* Process holding the lock. */
546 };
547 #endif
548+#endif
549
550 /* Define some more compatibility macros to be backward compatible with
551 BSD systems which did not managed to hide these kernel macros. */
552diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sparc/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/sparc/bits/fcntl.h
553--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/sparc/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
554+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/sparc/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
555@@ -160,6 +160,7 @@
556 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
557 #endif
558
559+#ifndef HAVE_ARCH_STRUCT_FLOCK
560 struct flock
561 {
562 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
563@@ -174,7 +175,9 @@
564 __pid_t l_pid; /* Process holding the lock. */
565 short int __unused;
566 };
567+#endif
568
569+#ifndef HAVE_ARCH_STRUCT_FLOCK64
570 #ifdef __USE_LARGEFILE64
571 struct flock64
572 {
573@@ -186,6 +189,7 @@
574 short int __unused;
575 };
576 #endif
577+#endif
578
579 /* Define some more compatibility macros to be backward compatible with
580 BSD systems which did not managed to hide these kernel macros. */
581diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/v850/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/v850/bits/fcntl.h
582--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/v850/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
583+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/v850/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
584@@ -136,6 +136,7 @@
585 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
586 #endif
587
588+#ifndef HAVE_ARCH_STRUCT_FLOCK
589 struct flock
590 {
591 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
592@@ -149,7 +150,9 @@
593 #endif
594 __pid_t l_pid; /* Process holding the lock. */
595 };
596+#endif
597
598+#ifndef HAVE_ARCH_STRUCT_FLOCK64
599 #ifdef __USE_LARGEFILE64
600 struct flock64
601 {
602@@ -160,6 +163,7 @@
603 __pid_t l_pid; /* Process holding the lock. */
604 };
605 #endif
606+#endif
607
608 /* Define some more compatibility macros to be backward compatible with
609 BSD systems which did not managed to hide these kernel macros. */
610diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/vax/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/vax/bits/fcntl.h
611--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/vax/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
612+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/vax/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
613@@ -116,6 +116,7 @@
614 # define LOCK_UN 8 /* remove lock */
615 #endif
616
617+#ifndef HAVE_ARCH_STRUCT_FLOCK
618 struct flock
619 {
620 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
621@@ -129,7 +130,9 @@
622 #endif
623 __pid_t l_pid; /* Process holding the lock. */
624 };
625+#endif
626
627+#ifndef HAVE_ARCH_STRUCT_FLOCK64
628 #ifdef __USE_LARGEFILE64
629 struct flock64
630 {
631@@ -140,6 +143,7 @@
632 __pid_t l_pid; /* Process holding the lock. */
633 };
634 #endif
635+#endif
636
637 /* Define some more compatibility macros to be backward compatible with
638 BSD systems which did not managed to hide these kernel macros. */
639diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/x86_64/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/x86_64/bits/fcntl.h
640--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/x86_64/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
641+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/x86_64/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
642@@ -157,6 +157,7 @@
643 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
644 #endif
645
646+#ifndef HAVE_ARCH_STRUCT_FLOCK
647 struct flock
648 {
649 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
650@@ -170,7 +171,9 @@
651 #endif
652 __pid_t l_pid; /* Process holding the lock. */
653 };
654+#endif
655
656+#ifndef HAVE_ARCH_STRUCT_FLOCK64
657 #ifdef __USE_LARGEFILE64
658 struct flock64
659 {
660@@ -181,6 +184,7 @@
661 __pid_t l_pid; /* Process holding the lock. */
662 };
663 #endif
664+#endif
665
666 /* Define some more compatibility macros to be backward compatible with
667 BSD systems which did not managed to hide these kernel macros. */
668diff -Naur uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/xtensa/bits/fcntl.h uClibc-0.9.30-rc3/libc/sysdeps/linux/xtensa/bits/fcntl.h
669--- uClibc-0.9.30-rc3.orig/libc/sysdeps/linux/xtensa/bits/fcntl.h 2008-09-16 10:02:54.000000000 -0400
670+++ uClibc-0.9.30-rc3/libc/sysdeps/linux/xtensa/bits/fcntl.h 2008-11-08 10:10:44.000000000 -0500
671@@ -140,6 +140,7 @@
672 # define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
673 #endif
674
675+#ifndef HAVE_ARCH_STRUCT_FLOCK
676 struct flock
677 {
678 short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
679@@ -153,7 +154,9 @@
680 #endif
681 __pid_t l_pid; /* Process holding the lock. */
682 };
683+#endif
684
685+#ifndef HAVE_ARCH_STRUCT_FLOCK64
686 #ifdef __USE_LARGEFILE64
687 struct flock64
688 {
689@@ -164,6 +167,7 @@
690 __pid_t l_pid; /* Process holding the lock. */
691 };
692 #endif
693+#endif
694
695 /* Define some more compatibility macros to be backward compatible with
696 BSD systems which did not managed to hide these kernel macros. */
Note: See TracBrowser for help on using the repository browser.