slang: Fix namespace conflict vis-a-vis posix_close
Fixes errors like | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang-2.2.4/src/slpo sio.c:366:12: error: conflicting types for 'posix_close' | static int posix_close (SLFile_FD_Type *f) | ^ | In file included from /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1 2/slang-2.2.4/src/slinclud.h:20:0, | from /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1 2/slang-2.2.4/src/slposio.c:24: | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86-64/usr/include/unistd.h:38:5: note: previous de claration of 'posix_close' was here | int posix_close(int, int); | ^ | make[1]: *** [/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang- 2.2.4/src/elfobjs/slposio.o] Error 1 (From OE-Core rev: 6b0cebe506b73cee7591089b624b69e009100c89) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5ee0383697
commit
27a850ab08
|
@ -0,0 +1,39 @@
|
|||
From 96eb7e29822151823a66a1eb59f1fa4aead5ae08 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 31 Aug 2015 06:33:21 +0000
|
||||
Subject: [PATCH] Fix error: conflicting types for 'posix_close'
|
||||
|
||||
Exposed while compiling on musl
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
src/slposio.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slposio.c b/src/slposio.c
|
||||
index 9ce9697..9ff9bfe 100644
|
||||
--- a/src/slposio.c
|
||||
+++ b/src/slposio.c
|
||||
@@ -363,7 +363,7 @@ static int posix_close_fd (int *fd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int posix_close (SLFile_FD_Type *f)
|
||||
+static int posix_closex (SLFile_FD_Type *f)
|
||||
{
|
||||
int status = do_close (f);
|
||||
|
||||
@@ -1001,7 +1001,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] =
|
||||
MAKE_INTRINSIC_2("write", posix_write, V, F, B),
|
||||
MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
|
||||
MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
|
||||
- MAKE_INTRINSIC_1("close", posix_close, I, F),
|
||||
+ MAKE_INTRINSIC_1("close", posix_closex, I, F),
|
||||
MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
|
||||
#if defined(TTYNAME_R)
|
||||
MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),
|
||||
--
|
||||
2.5.1
|
||||
|
|
@ -22,6 +22,7 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
|
|||
file://change-char-type-to-signed-char-in-macros.patch \
|
||||
file://sprintf-bug-concerning-8-bit-characters.patch \
|
||||
file://slang-fix-the-iconv-existence-checking.patch \
|
||||
file://0001-Fix-error-conflicting-types-for-posix_close.patch \
|
||||
"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
|
Loading…
Reference in New Issue