diff options
| author | Ben Byer <bbyer@xyzzy.local> | 2007-03-03 21:52:56 -0800 |
|---|---|---|
| committer | Ben Byer <bbyer@xyzzy.local> | 2007-03-03 21:52:56 -0800 |
| commit | 215e3691b76a63e6af19865790193b20b105ec5a (patch) | |
| tree | 92e2db88bbe1dcaeaab72f8a4c8e103bab30d083 /hw/darwin/apple | |
| parent | ea8dcc458ea8870126cf8d3e21cab9d63d094c5e (diff) | |
stopped using XTrans internals in X11.app because they're apparently no longer public
Diffstat (limited to 'hw/darwin/apple')
| -rw-r--r-- | hw/darwin/apple/bundle-main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c index 12fb1bf54..a35e1e37f 100644 --- a/hw/darwin/apple/bundle-main.c +++ b/hw/darwin/apple/bundle-main.c @@ -601,10 +601,10 @@ display_exists_p (int number) int idisplay, iscreen; char *conn_auth_name, *conn_auth_data; int conn_auth_namelen, conn_auth_datalen; - +#ifdef USE_XTRANS_INTERNALS extern void *_X11TransConnectDisplay (); extern void _XDisconnectDisplay (); - +#endif /* Since connecting to the display waits for a few seconds 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 @@ -613,7 +613,7 @@ display_exists_p (int number) sprintf (buf, "/tmp/.X11-unix/X%d", number); if (access (buf, F_OK) != 0) return FALSE; - +#ifdef USE_XTRANS_INTERNALS /* 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 needing to hold the necessary authentication to use it) */ @@ -626,6 +626,7 @@ display_exists_p (int number) return FALSE; _XDisconnectDisplay (conn); +#endif return TRUE; } |