upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 08:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up build errors on Windows for 9.5.0a7.

Browse source 
Also, changed isc_destroy_radix() to isc_radix_destroy() to match
the naming convention for other radix routines.
This commit is contained in:
Evan Hunt 2007-09-28 00:11:32 +00:00
parent 19bcb91965
commit adcd4ef11a
11 changed files with 82 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/dns/iptable.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: iptable.c,v 1.4 2007/09/14 01:46:05 marka Exp $ */
/* $Id: iptable.c,v 1.5 2007/09/28 00:11:32 each Exp $ */
#include <isc/mem.h>
#include <isc/radix.h>
@ -148,7 +148,7 @@ destroy_iptable(dns_iptable_t *dtab) {
REQUIRE(DNS_IPTABLE_VALID(dtab));
if (dtab->radix != NULL) {
isc_destroy_radix(dtab->radix, NULL);
isc_radix_destroy(dtab->radix, NULL);
dtab->radix = NULL;
}

12
lib/dns/win32/libdns.def
View file

@ -18,16 +18,15 @@ dns_acache_setdb
dns_acache_setentry
dns_acache_shutdown
dns_acl_any
dns_acl_appendelement
dns_acl_attach
dns_acl_create
dns_acl_detach
dns_acl_elementmatch
dns_acl_equal
dns_acl_isany
dns_acl_isinsecure
dns_acl_isnone
dns_acl_match
dns_acl_merge
dns_acl_none
dns_aclelement_equal
dns_aclelement_match
dns_aclenv_copy
dns_aclenv_destroy
@ -195,6 +194,11 @@ dns_fwdtable_add
dns_fwdtable_create
dns_fwdtable_destroy
dns_fwdtable_find
dns_iptable_addprefix
dns_iptable_attach
dns_iptable_create
dns_iptable_detach
dns_iptable_merge
dns_journal_begin_transaction
dns_journal_commit
dns_journal_current_rr

8
lib/dns/win32/libdns.dsp
View file

@ -190,6 +190,10 @@ SOURCE=..\include\dns\forward.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\iptable.h
# End Source File
# Begin Source File
SOURCE=..\include\dns\journal.h
# End Source File
# Begin Source File
@ -478,6 +482,10 @@ SOURCE=..\forward.c
# End Source File
# Begin Source File
SOURCE=..\iptable.c
# End Source File
# Begin Source File
SOURCE=..\journal.c
# End Source File
# Begin Source File

18
lib/dns/win32/libdns.mak
View file

@ -1046,6 +1046,24 @@ SOURCE=..\forward.c
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE=..\iptable.c
!IF "$(CFG)" == "libdns - Win32 Release"
"$(INTDIR)\iptable.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "libdns - Win32 Debug"
"$(INTDIR)\iptable.obj" "$(INTDIR)\iptable.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE=..\journal.c

4
lib/isc/include/isc/radix.h
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: radix.h,v 1.4 2007/09/19 03:03:29 marka Exp $ */
/* $Id: radix.h,v 1.5 2007/09/28 00:11:32 each Exp $ */
/*
* This source was adapted from MRT's RCS Ids:
@ -109,7 +109,7 @@ isc_result_t
isc_radix_create(isc_mem_t *mctx, isc_radix_tree_t **target, int maxbits);
void
isc_destroy_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func);
isc_radix_destroy(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func);
void
isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func);

4
lib/isc/radix.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: radix.c,v 1.6 2007/09/24 17:18:25 each Exp $ */
/* $Id: radix.c,v 1.7 2007/09/28 00:11:32 each Exp $ */
/*
* This source was adapted from MRT's RCS Ids:
@ -197,7 +197,7 @@ _clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) {
void
isc_destroy_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func)
isc_radix_destroy(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func)
{
REQUIRE(radix != NULL);
_clear_radix(radix, func);

13
lib/isc/win32/libisc.def
View file

@ -304,6 +304,12 @@ isc_quota_max
isc_quota_release
isc_quota_reserve
isc_quota_soft
isc_radix_create
isc_radix_destroy
isc_radix_insert
isc_radix_process
isc_radix_remove
isc_radix_search
isc_random_get
isc_random_jitter
isc_random_seed
@ -406,6 +412,13 @@ isc_stdio_seek
isc_stdio_sync
isc_stdio_write
isc_stdtime_get
isc_string_append
isc_string_append_truncate
isc_string_copy
isc_string_copy_truncate
isc_string_printf
isc_string_printf_truncate
isc_string_regiondup
isc_string_separate
isc_string_strlcat
isc_string_strlcpy

10
lib/isc/win32/libisc.dsp
View file

@ -1,7 +1,7 @@
# Microsoft Developer Studio Project File - Name="libisc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=libisc - Win32 Debug
@ -417,6 +417,10 @@ SOURCE=..\include\isc\quota.h
# End Source File
# Begin Source File
SOURCE=..\include\isc\radix.h
# End Source File
# Begin Source File
SOURCE=..\include\isc\random.h
# End Source File
# Begin Source File
@ -665,6 +669,10 @@ SOURCE=..\quota.c
# End Source File
# Begin Source File
SOURCE=..\radix.c
# End Source File
# Begin Source File
SOURCE=..\random.c
# End Source File
# Begin Source File

18
lib/isc/win32/libisc.mak
View file

@ -1566,6 +1566,24 @@ SOURCE=..\quota.c
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE=..\radix.c
!IF "$(CFG)" == "libisc - Win32 Release"
"$(INTDIR)\radix.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "libisc - Win32 Debug"
"$(INTDIR)\radix.obj" "$(INTDIR)\radix.sbr" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE=..\random.c

2
lib/lwres/win32/liblwres.dsp
View file

@ -70,7 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR /YX /FD /GZ /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

2
lib/lwres/win32/liblwres.mak
View file

@ -253,7 +253,7 @@ CLEAN :
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc"