diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:18 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:18 +0000 |
| commit | 8e23f7a29fe6a0cb49e92e947c93aaebf37abe6e (patch) | |
| tree | cbd84338c44cafee421ed21e22620723cb2faffd | |
| parent | 7e5650376f71e6aa323f2c0e0d5d8d38fd1bfa7b (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | src/sm_genid.c | 1 | ||||
| -rw-r--r-- | src/sm_manager.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/sm_genid.c b/src/sm_genid.c index 67b3317..171e762 100644 --- a/src/sm_genid.c +++ b/src/sm_genid.c @@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group. #endif #include <X11/SM/SMlib.h> #include "SMlibint.h" -#include <X11/Xtrans.h> #ifdef XTHREADS #include <X11/Xthreads.h> #endif diff --git a/src/sm_manager.c b/src/sm_manager.c index 5c7cc55..2c49c65 100644 --- a/src/sm_manager.c +++ b/src/sm_manager.c @@ -32,7 +32,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/SM/SMlib.h> #include "SMlibint.h" -#include <X11/Xtrans.h> #ifdef __USLC__ #undef shutdown @@ -166,13 +165,16 @@ char **failureReasonRet; +/* Using private API from libICE. */ +extern char *_IceGetPeerName (IceConn /* iceConn */); + char * SmsClientHostName (smsConn) SmsConn smsConn; { - return (_IceTransGetPeerNetworkId (smsConn->iceConn->trans_conn)); + return (_IceGetPeerName (smsConn->iceConn)); } |