emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] concurrency-libtask f6aa233 09/10: Revert change in fd_han


From: Philipp Stephani
Subject: [Emacs-diffs] concurrency-libtask f6aa233 09/10: Revert change in fd_handler.
Date: Wed, 26 Oct 2016 21:32:44 +0000 (UTC)

branch: concurrency-libtask
commit f6aa233fca05e0d884769f610a68b1d1a3af5dd0
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    Revert change in fd_handler.
    
    Crashes Emacs on macOS and shouldn’t be needed anyway as fd_handler runs
    in a background thread.
---
 src/nsterm.m |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index b0883f3..d0a03c2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5509,7 +5509,7 @@ not_in_argv (NSString *arg)
           fd_set fds;
           FD_ZERO (&fds);
           FD_SET (selfds[0], &fds);
-          result = pselect_noblock (selfds[0]+1, &fds, NULL, NULL, NULL, NULL);
+          result = select (selfds[0]+1, &fds, NULL, NULL, NULL);
           if (result > 0 && read (selfds[0], &c, 1) == 1 && c == 'g')
            waiting = 0;
         }
@@ -5543,7 +5543,7 @@ not_in_argv (NSString *arg)
           FD_SET (selfds[0], &readfds);
           if (selfds[0] >= nfds) nfds = selfds[0]+1;
 
-          result = pselect_noblock (nfds, &readfds, wfds, NULL, tmo, NULL);
+          result = pselect (nfds, &readfds, wfds, NULL, tmo, NULL);
 
           if (result == 0)
             ns_send_appdefined (-2);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]