Skip to content

Commit

Permalink
Changed the way waitpid is handled for jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
N-Holzschuch committed Nov 7, 2019
1 parent 18a2814 commit fcd8473
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
20 changes: 20 additions & 0 deletions get_frameworks.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

IOS_SYSTEM_VER="2.4"

HHROOT="https://github.com/holzschu"

mkdir -p "${BASH_SOURCE%/*}/Frameworks"

(cd "${BASH_SOURCE%/*}/Frameworks"
# ios_system
echo "Downloading Frameworks:"
curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/release.tar.gz
( tar -xzf release.tar.gz --strip 1 && rm release.tar.gz ) || { echo "ios_system failed to download"; exit 1; }
)

(cd "${BASH_SOURCE%/*}/src/"
# ios_error.h
curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/ios_error.h
)

2 changes: 1 addition & 1 deletion src/auto/configure
Original file line number Diff line number Diff line change
Expand Up @@ -14788,7 +14788,7 @@ $as_echo "yes, we need CoreServices" >&6; }
$as_echo "yes, we need AppKit/UIKit" >&6; }
# iOS, TODO: make this automatic
# LIBS="$LIBS -framework AppKit"
LIBS="-F .. -framework ios_system $LIBS -framework UIKit -lobjc -framework Foundation -framework lua_ios -framework Python3_ios "
LIBS="-F ../Frameworks -framework ios_system $LIBS -framework UIKit -lobjc -framework Foundation -framework lua_ios -framework Python3_ios "
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
Expand Down
2 changes: 1 addition & 1 deletion src/os_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -6043,7 +6043,7 @@ mch_detect_ended_job(job_T *job_list)
for (job = job_list; job != NULL; job = job->jv_next)
{
wait_pid = waitpid(job->jv_pid, &status, WNOHANG);
if (wait_pid == -1) {
if ((wait_pid == -1) || (wait_pid == job->jv_pid)) {
// This job terminated
if (WIFEXITED(status))
/* LINTED avoid "bitwise operation on signed value" */
Expand Down

0 comments on commit fcd8473

Please sign in to comment.