frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stopped using XTrans internals in X11.app because they're apparently no longer public

This commit is contained in:
Ben Byer 2007-03-03 21:52:56 -08:00
parent ea8dcc458e
commit 215e3691b7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/darwin/apple/bundle-main.c
View File

@ -601,10 +601,10 @@ display_exists_p (int number)
int idisplay, iscreen; int idisplay, iscreen;
char *conn_auth_name, *conn_auth_data; char *conn_auth_name, *conn_auth_data;
int conn_auth_namelen, conn_auth_datalen; int conn_auth_namelen, conn_auth_datalen;
#ifdef USE_XTRANS_INTERNALS
extern void *_X11TransConnectDisplay (); extern void *_X11TransConnectDisplay ();
extern void _XDisconnectDisplay (); extern void _XDisconnectDisplay ();
#endif
/* Since connecting to the display waits for a few seconds if the /* Since connecting to the display waits for a few seconds if the
display doesn't exist, check for trivial non-existence - if the display doesn't exist, check for trivial non-existence - if the
socket in /tmp exists or not.. (note: if the socket exists, the socket in /tmp exists or not.. (note: if the socket exists, the
@ -613,7 +613,7 @@ display_exists_p (int number)
sprintf (buf, "/tmp/.X11-unix/X%d", number); sprintf (buf, "/tmp/.X11-unix/X%d", number);
if (access (buf, F_OK) != 0) if (access (buf, F_OK) != 0)
return FALSE; return FALSE;
#ifdef USE_XTRANS_INTERNALS
/* This is a private function that we shouldn't really be calling, /* This is a private function that we shouldn't really be calling,
but it's the best way to see if the server exists (without but it's the best way to see if the server exists (without
needing to hold the necessary authentication to use it) */ needing to hold the necessary authentication to use it) */
@ -626,6 +626,7 @@ display_exists_p (int number)
return FALSE; return FALSE;
_XDisconnectDisplay (conn); _XDisconnectDisplay (conn);
#endif
return TRUE; return TRUE;
} }