diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2008-02-19 15:22:13 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2008-02-19 15:22:13 +0000 |
| commit | 1ad7c24419422ce0d62c80699eb4cd30b1c3d51b (patch) | |
| tree | a8d853bff3d5101093ed37a2a9cf8f3fbc8628fb /src/ccapi/server | |
| parent | c90fb4c40ec4fb78e4d1b2a40c9c5af36225603c (diff) | |
| download | krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.tar.gz krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.tar.xz krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.zip | |
Changes to integrate the CCAPI build into the build structure, build the test suite and fixes to random problems discovered along the way
Since no platform other than windows builds CCAPI using the build system, some conditionalizing may be necessary when other platforms use the makefiles.
src/Makefile.in: Add CPPFLAGS that seemed to be missing; run wconfig for ccapi/(lib, server, test).
config/win-pre.in: DEBUGOPT /ZI doesn't seem to provide enough debugging information under VS2005; /Zi does.
windows/build/bkw.pl: Fix -no<switch> so that -nonodebug will work. Otherwise, can't do debug build.
Move Get/PutTspData out of dllmain; add tlsindex argument.
Comment out some debug messages.
TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20229 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/server')
| -rw-r--r-- | src/ccapi/server/win/ccs_os_server.cpp | 4 | ||||
| -rw-r--r-- | src/ccapi/server/win/ccs_win_pipe.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp index 0c3f7660e..61392e9a3 100644 --- a/src/ccapi/server/win/ccs_os_server.cpp +++ b/src/ccapi/server/win/ccs_os_server.cpp @@ -941,10 +941,10 @@ RPC_STATUS RPC_ENTRY sec_callback( IN RPC_IF_ID *Interface, /* MIDL allocate and free */
/*********************************************************************/
-void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) {
+extern "C" void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) {
return(malloc(len));
}
-void __RPC_USER midl_user_free(void __RPC_FAR * ptr) {
+extern "C" void __RPC_USER midl_user_free(void __RPC_FAR * ptr) {
free(ptr);
}
diff --git a/src/ccapi/server/win/ccs_win_pipe.c b/src/ccapi/server/win/ccs_win_pipe.c index a8fea2f38..7c6137127 100644 --- a/src/ccapi/server/win/ccs_win_pipe.c +++ b/src/ccapi/server/win/ccs_win_pipe.c @@ -25,6 +25,8 @@ */ #include "assert.h" +#include <stdlib.h> +#include <malloc.h> #include "ccs_win_pipe.h" #include "cci_debugging.h" |