diff options
author | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:40 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:40 +0000 |
commit | bbfdbf2a32e0b33811a100e7b74dc2a94b6e4051 (patch) | |
tree | 85c5433de8dca77ba65f1271a2f09a2fe1f9e341 /socket.c | |
parent | 4e28ae75ceb86e2e3b51125808cbeadc3dcaeb79 (diff) |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
Diffstat (limited to 'socket.c')
-rw-r--r-- | socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $XdotOrg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ +/* $XdotOrg$ */ /* $Xorg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* @@ -69,9 +69,9 @@ CreateWellKnownSockets (void) #if defined(IPv6) && defined(AF_INET6) chooserFd = socket (AF_INET6, SOCK_STREAM, 0); -#else - chooserFd = socket (AF_INET, SOCK_STREAM, 0); + if (chooserFd == -1) #endif + chooserFd = socket (AF_INET, SOCK_STREAM, 0); Debug ("Created chooser socket %d\n", chooserFd); if (chooserFd == -1) { |