mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-29 02:31:18 +00:00
XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing. Don't use the dynamic fd addition code since it's not quite working correctly. (cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
This commit is contained in:
parent
277a74bcbb
commit
30851efdd4
6 changed files with 47 additions and 13 deletions
|
|
@ -327,9 +327,12 @@ static void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, in
|
|||
}
|
||||
}
|
||||
|
||||
int xquartz_launchd_fd = -1;
|
||||
|
||||
void DarwinListenOnOpenFD(int fd) {
|
||||
ErrorF("DarwinListenOnOpenFD: %d\n", fd);
|
||||
|
||||
#if 0
|
||||
pthread_mutex_lock(&fd_add_lock);
|
||||
if(fd_add_count < FD_ADD_MAX)
|
||||
fd_add[fd_add_count++] = fd;
|
||||
|
|
@ -337,6 +340,9 @@ void DarwinListenOnOpenFD(int fd) {
|
|||
ErrorF("FD Addition buffer at max. Dropping fd addition request.\n");
|
||||
|
||||
pthread_mutex_unlock(&fd_add_lock);
|
||||
#else
|
||||
xquartz_launchd_fd = fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
void DarwinProcessFDAdditionQueue() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue