Skip to content

Commit fcd8473

Browse files
committed
Changed the way waitpid is handled for jobs
1 parent 18a2814 commit fcd8473

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

get_frameworks.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
IOS_SYSTEM_VER="2.4"
4+
5+
HHROOT="https://github.com/holzschu"
6+
7+
mkdir -p "${BASH_SOURCE%/*}/Frameworks"
8+
9+
(cd "${BASH_SOURCE%/*}/Frameworks"
10+
# ios_system
11+
echo "Downloading Frameworks:"
12+
curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/release.tar.gz
13+
( tar -xzf release.tar.gz --strip 1 && rm release.tar.gz ) || { echo "ios_system failed to download"; exit 1; }
14+
)
15+
16+
(cd "${BASH_SOURCE%/*}/src/"
17+
# ios_error.h
18+
curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/ios_error.h
19+
)
20+

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14788,7 +14788,7 @@ $as_echo "yes, we need CoreServices" >&6; }
1478814788
$as_echo "yes, we need AppKit/UIKit" >&6; }
1478914789
# iOS, TODO: make this automatic
1479014790
# LIBS="$LIBS -framework AppKit"
14791-
LIBS="-F .. -framework ios_system $LIBS -framework UIKit -lobjc -framework Foundation -framework lua_ios -framework Python3_ios "
14791+
LIBS="-F ../Frameworks -framework ios_system $LIBS -framework UIKit -lobjc -framework Foundation -framework lua_ios -framework Python3_ios "
1479214792
fi
1479314793
else
1479414794
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

src/os_unix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6043,7 +6043,7 @@ mch_detect_ended_job(job_T *job_list)
60436043
for (job = job_list; job != NULL; job = job->jv_next)
60446044
{
60456045
wait_pid = waitpid(job->jv_pid, &status, WNOHANG);
6046-
if (wait_pid == -1) {
6046+
if ((wait_pid == -1) || (wait_pid == job->jv_pid)) {
60476047
// This job terminated
60486048
if (WIFEXITED(status))
60496049
/* LINTED avoid "bitwise operation on signed value" */

0 commit comments

Comments
 (0)