svn rev #21962: trunk/src/ccapi/ common/win/ lib/win/ server/win/
raeburn@MIT.EDU
raeburn at MIT.EDU
Tue Feb 10 19:58:43 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21962
Commit By: raeburn
Log Message:
Some updates to compile and link on Windows, with recent CCAPI changes.
Changed Files:
U trunk/src/ccapi/common/win/tls.h
U trunk/src/ccapi/lib/win/Makefile.in
U trunk/src/ccapi/server/win/Makefile.in
U trunk/src/ccapi/server/win/WorkQueue.h
U trunk/src/ccapi/server/win/ccs_os_server.cpp
U trunk/src/ccapi/server/win/workitem.h
Modified: trunk/src/ccapi/common/win/tls.h
===================================================================
--- trunk/src/ccapi/common/win/tls.h 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/common/win/tls.h 2009-02-11 00:58:41 UTC (rev 21962)
@@ -33,7 +33,7 @@
#include "time.h"
#include "rpc.h"
-#include "cci_stream.h"
+#include "k5-ipc_stream.h"
#define UUID_SIZE 128
Modified: trunk/src/ccapi/lib/win/Makefile.in
===================================================================
--- trunk/src/ccapi/lib/win/Makefile.in 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/lib/win/Makefile.in 2009-02-11 00:58:41 UTC (rev 21962)
@@ -7,6 +7,7 @@
$(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 @@
$(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 @@
##### 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
Modified: trunk/src/ccapi/server/win/Makefile.in
===================================================================
--- trunk/src/ccapi/server/win/Makefile.in 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/server/win/Makefile.in 2009-02-11 00:58:41 UTC (rev 21962)
@@ -22,7 +22,6 @@
$(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 @@
##### 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)
Modified: trunk/src/ccapi/server/win/WorkQueue.h
===================================================================
--- trunk/src/ccapi/server/win/WorkQueue.h 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/server/win/WorkQueue.h 2009-02-11 00:58:41 UTC (rev 21962)
@@ -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 @@
k5_ipc_stream* stream,
time_t* serverStartTime);
-#endif // _work_queue_h
\ No newline at end of file
+#endif // _work_queue_h
Modified: trunk/src/ccapi/server/win/ccs_os_server.cpp
===================================================================
--- trunk/src/ccapi/server/win/ccs_os_server.cpp 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/server/win/ccs_os_server.cpp 2009-02-11 00:58:41 UTC (rev 21962)
@@ -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_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;
+}
Modified: trunk/src/ccapi/server/win/workitem.h
===================================================================
--- trunk/src/ccapi/server/win/workitem.h 2009-02-11 00:53:28 UTC (rev 21961)
+++ trunk/src/ccapi/server/win/workitem.h 2009-02-11 00:58:41 UTC (rev 21962)
@@ -5,7 +5,6 @@
#include "windows.h"
extern "C" {
- #include "cci_stream.h"
#include "ccs_pipe.h"
}
@@ -45,4 +44,4 @@
bool isEmpty() {return wl.empty();}
};
-#endif // __WorkItem
\ No newline at end of file
+#endif // __WorkItem
More information about the cvs-krb5
mailing list