Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 96eb7e29822151823a66a1eb59f1fa4aead5ae08 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 31 Aug 2015 06:33:21 +0000 |
| 4 | Subject: [PATCH] Fix error: conflicting types for 'posix_close' |
| 5 | |
| 6 | Exposed while compiling on musl |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | src/slposio.c | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/src/slposio.c b/src/slposio.c |
| 16 | index 9ce9697..9ff9bfe 100644 |
| 17 | --- a/src/slposio.c |
| 18 | +++ b/src/slposio.c |
| 19 | @@ -363,7 +363,7 @@ static int posix_close_fd (int *fd) |
| 20 | return 0; |
| 21 | } |
| 22 | |
| 23 | -static int posix_close (SLFile_FD_Type *f) |
| 24 | +static int posix_closex (SLFile_FD_Type *f) |
| 25 | { |
| 26 | int status = do_close (f); |
| 27 | |
| 28 | @@ -1001,7 +1001,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] = |
| 29 | MAKE_INTRINSIC_2("write", posix_write, V, F, B), |
| 30 | MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F), |
| 31 | MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I), |
| 32 | - MAKE_INTRINSIC_1("close", posix_close, I, F), |
| 33 | + MAKE_INTRINSIC_1("close", posix_closex, I, F), |
| 34 | MAKE_INTRINSIC_1("_close", posix_close_fd, I, I), |
| 35 | #if defined(TTYNAME_R) |
| 36 | MAKE_INTRINSIC_0("ttyname", posix_ttyname, V), |
| 37 | -- |
| 38 | 2.5.1 |
| 39 | |