CCAPI should use common ipc and stream code

KIM and CCAPI should share the same IPC and stream object types.
Modified CCAPI to use code in src/util (stream) and src/util/mac (ipc)

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20787 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 5 insertions, 5 deletions

diff --git a/src/ccapi/common/win/tls.c b/src/ccapi/common/win/tls.c
index 45020b570..5e0e11d7a 100644
--- a/src/ccapi/common/win/tls.c
+++ b/src/ccapi/common/win/tls.c
@@ -57,7 +57,7 @@ void         tspdata_setRpcAState (struct tspdata* p, RPC_ASYNC_STATE* rpcState)
 
 void         tspdata_setSST       (struct tspdata* p, time_t t)         {p->_sst = t;}
 
-void         tspdata_setStream    (struct tspdata* p, cci_stream_t s)   {p->_stream = s;}
+void         tspdata_setStream    (struct tspdata* p, k5_ipc_stream s)   {p->_stream = s;}
 
 
 BOOL         tspdata_getConnected (const struct tspdata* p)         {return p->_CCAPI_Connected;}
@@ -66,7 +66,7 @@ HANDLE       tspdata_getReplyEvent(const struct tspdata* p)         {return p->_
 
 time_t       tspdata_getSST       (const struct tspdata* p)         {return p->_sst;}
 
-cci_stream_t tspdata_getStream    (const struct tspdata* p)         {return p->_stream;}
+k5_ipc_stream tspdata_getStream    (const struct tspdata* p)         {return p->_stream;}
 
 char*        tspdata_getUUID      (const struct tspdata* p)         {return p->_uuid;}
 
diff --git a/src/ccapi/common/win/tls.h b/src/ccapi/common/win/tls.h
index 1a6086888..b6761c8bb 100644
--- a/src/ccapi/common/win/tls.h
+++ b/src/ccapi/common/win/tls.h
@@ -46,7 +46,7 @@ struct tspdata {
     RPC_ASYNC_STATE*    _rpcState;
     HANDLE              _replyEvent;
     time_t              _sst;
-    cci_stream_t        _stream;
+    k5_ipc_stream        _stream;
     char                _uuid[UUID_SIZE];
     };
 
@@ -57,14 +57,14 @@ void            tspdata_setConnected (struct tspdata* p, BOOL b);
 void            tspdata_setReplyEvent(struct tspdata* p, HANDLE h);
 void            tspdata_setRpcAState (struct tspdata* p, RPC_ASYNC_STATE* rpcState);
 void            tspdata_setSST       (struct tspdata* p, time_t t);
-void            tspdata_setStream    (struct tspdata* p, cci_stream_t s);
+void            tspdata_setStream    (struct tspdata* p, k5_ipc_stream s);
 void            tspdata_setUUID      (struct tspdata* p, unsigned char __RPC_FAR* uuidString);
 HANDLE          tspdata_getReplyEvent(const struct tspdata* p);
 
 BOOL             tspdata_getConnected(const struct tspdata* p);
 RPC_ASYNC_STATE* tspdata_getRpcAState(const struct tspdata* p);
 time_t           tspdata_getSST      (const struct tspdata* p);
-cci_stream_t     tspdata_getStream   (const struct tspdata* p);
+k5_ipc_stream     tspdata_getStream   (const struct tspdata* p);
 char*            tspdata_getUUID     (const struct tspdata* p);
 
 BOOL WINAPI PutTspData(DWORD tlsIndex, struct tspdata*  dw);