2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00

[master] merge several interdependent fixes

3760.   [bug]           Improve SIT with native PKCS#11 and on Windows.
			[RT #35433]

3759.   [port]          Enable delve on Windows. [RT #35441]

3758.   [port]          Enable export library APIs on windows. [RT #35382]
This commit is contained in:
Evan Hunt
2014-02-26 19:00:05 -08:00
parent 95c3a5e116
commit 98922b2b2b
109 changed files with 7208 additions and 529 deletions

View File

@@ -50,6 +50,7 @@
#include <fcntl.h>
#include <process.h>
#include <isc/app.h>
#include <isc/buffer.h>
#include <isc/bufferlist.h>
#include <isc/condition.h>
@@ -4066,4 +4067,25 @@ error:
}
#endif /* HAVE_LIBXML2 */
#include "../socket_api.c"
/*
* Replace ../socket_api.c
*/
isc_result_t
isc__socket_register() {
return (ISC_R_SUCCESS);
}
isc_result_t
isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx,
isc_socketmgr_t **managerp)
{
isc_result_t result;
result = isc_socketmgr_create(mctx, managerp);
if (result == ISC_R_SUCCESS)
isc_appctx_setsocketmgr(actx, *managerp);
return (result);
}