From c6527aedc77bb78a9f5e7658c29bdc724f16b54f Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Fri, 7 Dec 2018 09:24:24 -0800
Subject: [PATCH] fix win32 build

- add missing hooks.h and hooks.c to project files
- remove extraneous symbols from libns.def
---
 lib/bind9/win32/libbind9.vcxproj.in | 2 +-
 lib/ns/win32/libns.def              | 2 --
 lib/ns/win32/libns.vcxproj.filters  | 8 +++++++-
 lib/ns/win32/libns.vcxproj.in       | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in
index 261986a238..c0fe97c4ec 100644
--- a/lib/bind9/win32/libbind9.vcxproj.in
+++ b/lib/bind9/win32/libbind9.vcxproj.in
@@ -54,7 +54,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;../../ns/include;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
diff --git a/lib/ns/win32/libns.def b/lib/ns/win32/libns.def
index 95532062d1..bc0d891754 100644
--- a/lib/ns/win32/libns.def
+++ b/lib/ns/win32/libns.def
@@ -47,8 +47,6 @@ ns_hook_add
 ns_hooktable_create
 ns_hooktable_free
 ns_hooktable_init
-ns_hooktable_reset
-ns_hooktable_save
 ns_interface_attach
 ns_interface_detach
 ns_interface_shutdown
diff --git a/lib/ns/win32/libns.vcxproj.filters b/lib/ns/win32/libns.vcxproj.filters
index 7298efefdf..75f7a447ec 100644
--- a/lib/ns/win32/libns.vcxproj.filters
+++ b/lib/ns/win32/libns.vcxproj.filters
@@ -30,6 +30,9 @@
     <ClCompile Include="..\interfacemgr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\hooks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -68,6 +71,9 @@
     <ClInclude Include="..\include\ns\interfacemgr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\ns\hooks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\ns\lib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -105,4 +111,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in
index 7fb45595bf..6b884c1df4 100644
--- a/lib/ns/win32/libns.vcxproj.in
+++ b/lib/ns/win32/libns.vcxproj.in
@@ -110,6 +110,7 @@
   <ItemGroup>
     <ClCompile Include="..\client.c" />
     <ClCompile Include="..\interfacemgr.c" />
+    <ClCompile Include="..\hooks.c" />
     <ClCompile Include="..\lib.c" />
     <ClCompile Include="..\listenlist.c" />
     <ClCompile Include="..\log.c" />
@@ -126,6 +127,7 @@
   <ItemGroup>
     <ClInclude Include="..\include\ns\client.h" />
     <ClInclude Include="..\include\ns\interfacemgr.h" />
+    <ClInclude Include="..\include\ns\hooks.h" />
     <ClInclude Include="..\include\ns\lib.h" />
     <ClInclude Include="..\include\ns\listenlist.h" />
     <ClInclude Include="..\include\ns\log.h" />