SM ChangeLog,3.8,3.9 sm_manager.c,1.4,1.5

[Daniel Stone]

Committed by: daniels

Update of /cvs/xlibs/SM
In directory gabe:/tmp/cvs-serv3033

Modified Files:
	ChangeLog sm_manager.c 
Log Message:
* sm_manager.c:
Sync back with X.Org HEAD (change usage of _IceTransGetPeerNetworkId to
_IceGetPeerName; AIX build fixes).


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/SM/ChangeLog,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- ChangeLog	19 Jan 2005 06:38:28 -0000	3.8
+++ ChangeLog	28 Jan 2005 16:59:35 -0000	3.9
@@ -1,3 +1,9 @@
+2005-01-29  Daniel Stone  <daniel@freedesktop.org>
+
+	* sm_manager.c:
+	Sync back with X.Org HEAD (change usage of _IceTransGetPeerNetworkId to
+	_IceGetPeerName; AIX build fixes).
+
 2005-01-19  Daniel Stone  <daniel@freedesktop.org>
 
 	* configure.ac:

Index: sm_manager.c
===================================================================
RCS file: /cvs/xlibs/SM/sm_manager.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sm_manager.c	29 Oct 2003 06:09:14 -0000	1.4
+++ sm_manager.c	28 Jan 2005 16:59:35 -0000	1.5
@@ -32,8 +32,11 @@
 
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
-/* #include <X11/Xtrans.h> */
+#include <X11/Xtrans.h>
 
+#ifdef __USLC__
+#undef shutdown
+#endif
 
 
 Status
@@ -154,15 +157,15 @@
     return (status);
 }
 
+extern char *_IceGetPeerName (IceConn /* iceConn */);
 
-
 char *
 SmsClientHostName (smsConn)
 
 SmsConn smsConn;
 
 {
-    return (_IceTransGetPeerNetworkId (smsConn->iceConn->trans_conn));
+    return (_IceGetPeerName (smsConn->iceConn));
 }