mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-06 17:28:04 +02:00
Merge branch 'master' into xge
This commit is contained in:
commit
e9195db725
2 changed files with 1 additions and 7 deletions
|
|
@ -77,10 +77,7 @@ _XimTransConnect(
|
|||
spec->trans_conn = NULL;
|
||||
|
||||
if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
|
||||
{
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ in this Software without prior written authorization from The Open Group.
|
|||
#include <X11/Xdmcp.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if !defined(WIN32)
|
||||
#ifndef Lynx
|
||||
|
|
@ -389,10 +390,7 @@ _X11TransConnectDisplay (
|
|||
trans_conn = NULL;
|
||||
|
||||
if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
|
||||
{
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
|
@ -409,7 +407,6 @@ _X11TransConnectDisplay (
|
|||
{
|
||||
_X11TransClose(trans_conn);
|
||||
trans_conn = NULL;
|
||||
sleep(1);
|
||||
if (saddr)
|
||||
{
|
||||
free ((char *) saddr);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue