| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Include fcntl.h to pacify compiler errors on musl |
| 2 | like |
| 3 | |
| 4 | error: unknown type name 'loff_t' |
| 5 | Cover rpc headers under proper conditional |
| 6 | Dont use __P its undefined |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | |
| 12 | ndex: quota-tools/quota.h |
| 13 | =================================================================== |
| 14 | Index: quota-tools/quota.h |
| 15 | =================================================================== |
| 16 | --- quota-tools.orig/quota.h |
| 17 | +++ quota-tools/quota.h |
| 18 | @@ -165,6 +165,6 @@ enum { |
| 19 | #endif |
| 20 | #endif |
| 21 | |
| 22 | -long quotactl __P((int, const char *, qid_t, caddr_t)); |
| 23 | +long quotactl (int, const char *, qid_t, caddr_t); |
| 24 | |
| 25 | #endif /* _QUOTA_ */ |
| 26 | Index: quota-tools/quotacheck.c |
| 27 | =================================================================== |
| 28 | --- quota-tools.orig/quotacheck.c |
| 29 | +++ quota-tools/quotacheck.c |
| 30 | @@ -19,6 +19,7 @@ |
| 31 | #include <unistd.h> |
| 32 | #include <stdlib.h> |
| 33 | #include <errno.h> |
| 34 | +#include <fcntl.h> |
| 35 | |
| 36 | #include <sys/stat.h> |
| 37 | #include <sys/types.h> |
| 38 | Index: quota-tools/quotaio.c |
| 39 | =================================================================== |
| 40 | --- quota-tools.orig/quotaio.c |
| 41 | +++ quota-tools/quotaio.c |
| 42 | @@ -12,6 +12,7 @@ |
| 43 | #include <string.h> |
| 44 | #include <unistd.h> |
| 45 | #include <stdlib.h> |
| 46 | +#include <fcntl.h> |
| 47 | #include <sys/types.h> |
| 48 | #include <sys/stat.h> |
| 49 | #include <sys/file.h> |
| 50 | Index: quota-tools/dqblk_v2.h |
| 51 | =================================================================== |
| 52 | --- quota-tools.orig/dqblk_v2.h |
| 53 | +++ quota-tools/dqblk_v2.h |
| 54 | @@ -7,6 +7,7 @@ |
| 55 | #ifndef GUARD_DQBLK_V2_H |
| 56 | #define GUARD_DQBLK_V2_H |
| 57 | |
| 58 | +#include <fcntl.h> |
| 59 | #include <sys/types.h> |
| 60 | #include "quota_tree.h" |
| 61 | |
| 62 | Index: quota-tools/quotaops.c |
| 63 | =================================================================== |
| 64 | --- quota-tools.orig/quotaops.c |
| 65 | +++ quota-tools/quotaops.c |
| 66 | @@ -34,7 +34,9 @@ |
| 67 | |
| 68 | #include "config.h" |
| 69 | |
| 70 | +#if defined(RPC) |
| 71 | #include <rpc/rpc.h> |
| 72 | +#endif |
| 73 | #include <sys/types.h> |
| 74 | #include <sys/stat.h> |
| 75 | #include <sys/file.h> |
| 76 | Index: quota-tools/rquota_client.c |
| 77 | =================================================================== |
| 78 | --- quota-tools.orig/rquota_client.c |
| 79 | +++ quota-tools/rquota_client.c |
| 80 | @@ -19,7 +19,9 @@ |
| 81 | |
| 82 | #include "config.h" |
| 83 | |
| 84 | +#if defined(RPC) |
| 85 | #include <rpc/rpc.h> |
| 86 | +#endif |
| 87 | #include <sys/types.h> |
| 88 | #include <sys/param.h> |
| 89 | #include <sys/stat.h> |
| 90 | @@ -35,7 +37,9 @@ |
| 91 | #include <stdint.h> |
| 92 | |
| 93 | #include "mntopt.h" |
| 94 | +#if defined(RPC) |
| 95 | #include "rquota.h" |
| 96 | +#endif |
| 97 | #include "common.h" |
| 98 | #include "quotaio.h" |
| 99 | #include "quotasys.h" |
| 100 | Index: quota-tools/setquota.c |
| 101 | =================================================================== |
| 102 | --- quota-tools.orig/setquota.c |
| 103 | +++ quota-tools/setquota.c |
| 104 | @@ -7,7 +7,9 @@ |
| 105 | |
| 106 | #include "config.h" |
| 107 | |
| 108 | +#if defined(RPC) |
| 109 | #include <rpc/rpc.h> |
| 110 | +#endif |
| 111 | #include <sys/types.h> |
| 112 | #include <errno.h> |
| 113 | #include <stdio.h> |