diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-01-08 09:01:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:29 +0000 |
commit | f294813dfee9ccc8a6f213178e30d175d3694524 (patch) | |
tree | bdc45bbb21c01e8dec4b797ff1dbac667af37859 /meta/recipes-extended/chkconfig/chkconfig | |
parent | b2aca0936347fb714662142031eb0a2d5f8a0744 (diff) | |
download | poky-f294813dfee9ccc8a6f213178e30d175d3694524.tar.gz |
chkconfig: Avoid using caddr_t
(From OE-Core rev: 52658750ffb40386b7677de0330c1ab147e8679b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/chkconfig/chkconfig')
-rw-r--r-- | meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch new file mode 100644 index 0000000000..96d1938791 --- /dev/null +++ b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | caddr_t is a legacy BSD type which was rejected by the POSIX standard. | ||
2 | Use void * instead. | ||
3 | |||
4 | sys/unitstd.h is not needed and moreover its not available on all C library | ||
5 | implementations e.g. musl | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Index: chkconfig-1.3.58/alternatives.c | ||
10 | =================================================================== | ||
11 | --- chkconfig-1.3.58.orig/alternatives.c | ||
12 | +++ chkconfig-1.3.58/alternatives.c | ||
13 | @@ -22,7 +22,6 @@ | ||
14 | #include <stdio.h> | ||
15 | #include <string.h> | ||
16 | #include <sys/stat.h> | ||
17 | -#include <sys/unistd.h> | ||
18 | #include <unistd.h> | ||
19 | |||
20 | #define FLAGS_TEST (1 << 0) | ||
21 | Index: chkconfig-1.3.58/leveldb.c | ||
22 | =================================================================== | ||
23 | --- chkconfig-1.3.58.orig/leveldb.c | ||
24 | +++ chkconfig-1.3.58/leveldb.c | ||
25 | @@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name | ||
26 | fstat(fd, &sb); | ||
27 | |||
28 | bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); | ||
29 | - if (bufstart == ((caddr_t) -1)) { | ||
30 | + if (bufstart == ((void*) -1)) { | ||
31 | close(fd); | ||
32 | return -1; | ||
33 | } | ||