From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 11 Feb 2009 00:58:41 +0000 (+0000)
Subject: Some updates to compile and link on Windows, with recent CCAPI changes
X-Git-Tag: krb5-1.8-alpha1~651
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a521f1bd46bae30b708d5b42cd8cea85d9529be1;p=krb5.git

Some updates to compile and link on Windows, with recent CCAPI changes

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

diff --git a/src/ccapi/common/win/tls.h b/src/ccapi/common/win/tls.h
index b6761c8bb..32854f076 100644
--- a/src/ccapi/common/win/tls.h
+++ b/src/ccapi/common/win/tls.h
@@ -33,7 +33,7 @@
 #include "time.h"
 #include "rpc.h"
 
-#include "cci_stream.h"
+#include "k5-ipc_stream.h"
 
 #define UUID_SIZE   128
 
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index df4d95fd9..9fa6c02dc 100644
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -7,6 +7,7 @@ OBJS	= $(OUTPRE)ccapi_ccache.obj \
           $(OUTPRE)ccapi_credentials.obj \
           $(OUTPRE)ccapi_credentials_iterator.obj \
           $(OUTPRE)ccapi_ipc.obj \
+	  $(OUTPRE)ccapi_err.obj \
           $(OUTPRE)ccapi_os_ipc.obj \
           $(OUTPRE)ccapi_string.obj \
           $(OUTPRE)ccapi_v2.obj \
@@ -17,7 +18,6 @@ OBJS	= $(OUTPRE)ccapi_ccache.obj \
           $(OUTPRE)cci_message.obj \
           $(OUTPRE)cci_os_debugging.obj \
           $(OUTPRE)cci_os_identifier.obj \
-          $(OUTPRE)cci_stream.obj \
           $(OUTPRE)ccs_reply_proc.obj \
           $(OUTPRE)ccs_reply_s.obj \
           $(OUTPRE)ccs_request_c.obj \
@@ -62,7 +62,7 @@ CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501
 
 ##### Linker
 LINK	= link
-LIBS	= kernel32.lib ws2_32.lib user32.lib advapi32.lib
+LIBS	= ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib
 LFLAGS	= /nologo $(LOPTS)
 
 all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index ea095a050..3d8da6d22 100644
--- a/src/ccapi/server/win/Makefile.in
+++ b/src/ccapi/server/win/Makefile.in
@@ -22,7 +22,6 @@ OBJS	= $(OUTPRE)cci_array_internal.$(OBJEXT) \
           $(OUTPRE)cci_message.$(OBJEXT) \
           $(OUTPRE)cci_os_debugging.$(OBJEXT) \
           $(OUTPRE)cci_os_identifier.$(OBJEXT) \
-          $(OUTPRE)cci_stream.$(OBJEXT) \
           $(OUTPRE)ccs_array.$(OBJEXT) \
           $(OUTPRE)ccs_cache_collection.$(OBJEXT) \
           $(OUTPRE)ccs_callback.$(OBJEXT) \
@@ -66,7 +65,7 @@ CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501
 
 ##### Linker
 LINK	= link
-LIBS	= rpcrt4.lib advapi32.lib ws2_32.lib user32.lib
+LIBS	= ..\$(SLIB) rpcrt4.lib advapi32.lib ws2_32.lib user32.lib
 LFLAGS	= /nologo $(LOPTS)
 
 
diff --git a/src/ccapi/server/win/WorkQueue.h b/src/ccapi/server/win/WorkQueue.h
index 42d0cf207..b451e1297 100644
--- a/src/ccapi/server/win/WorkQueue.h
+++ b/src/ccapi/server/win/WorkQueue.h
@@ -28,7 +28,6 @@
 #define _work_queue_h
 
 #include "windows.h"
-#include "cci_stream.h"
 #include "ccs_pipe.h"
 
 EXTERN_C    BOOL worklist_isEmpty();
@@ -43,4 +42,4 @@ EXTERN_C    int  worklist_remove(long*              rpcmsg,
                                  k5_ipc_stream*      stream,
                                  time_t*            serverStartTime);
 
-#endif // _work_queue_h
\ No newline at end of file
+#endif // _work_queue_h
diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index e80a1c3aa..b22fdfa9b 100644
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -29,13 +29,12 @@
 
 extern "C" {
 #include "ccs_common.h"
+#include "ccs_os_notify.h"
 #include "ccs_os_server.h"
-#include <syslog.h>
 #include "ccs_reply.h"
 #include "ccs_request.h"
 #include "win-utils.h"
 #include "ccutils.h"
-#include "cci_stream.h"
     }
 
 #include "WorkQueue.h"
@@ -949,3 +948,16 @@ extern "C" void  __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) {
 extern "C" void __RPC_USER midl_user_free(void __RPC_FAR * ptr) {
     free(ptr);
     }
+
+/* stubs */
+extern "C" cc_int32
+ccs_os_notify_cache_collection_changed (ccs_cache_collection_t cc)
+{
+    return 0;
+}
+
+extern "C" cc_int32
+ccs_os_notify_ccache_changed (ccs_cache_collection_t cc, const char *name)
+{
+    return 0;
+}
diff --git a/src/ccapi/server/win/workitem.h b/src/ccapi/server/win/workitem.h
index 105380669..9829f8500 100644
--- a/src/ccapi/server/win/workitem.h
+++ b/src/ccapi/server/win/workitem.h
@@ -5,7 +5,6 @@
 #include "windows.h"
 
 extern "C" {
-    #include "cci_stream.h"
     #include "ccs_pipe.h"
     }
 
@@ -45,4 +44,4 @@ public:
     bool isEmpty() {return wl.empty();}
     };
 
-#endif  // __WorkItem
\ No newline at end of file
+#endif  // __WorkItem