Fixes needed to compile on windows

diff --git a/bin/named/win32/named.dsp b/bin/named/win32/named.dsp
index b3388e6ad9e1e7729873503579e08699f1976d1d..9a2d498192f2f1a269ff80af6feb4f299b434557 100644 (file)
--- a/bin/named/win32/named.dsp
+++ b/bin/named/win32/named.dsp
@@ -188,6 +188,10 @@ SOURCE=..\sortlist.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\statschannel.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\tkeyconf.c
 # End Source File
 # Begin Source File
@@ -288,6 +292,10 @@ SOURCE=..\include\named\sortlist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\named\statschannel.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\named\tkeyconf.h
 # End Source File
 # Begin Source File

diff --git a/bin/named/win32/named.mak b/bin/named/win32/named.mak
index 22c9f19245b5693d359c95d42a98595f25ffced3..c50e0a57f8daa49be8ab0504b38bda8ee512f33c 100644 (file)
--- a/bin/named/win32/named.mak
+++ b/bin/named/win32/named.mak
@@ -148,6 +148,7 @@ CLEAN :
        -@erase "$(INTDIR)\query.obj"
        -@erase "$(INTDIR)\server.obj"
        -@erase "$(INTDIR)\sortlist.obj"
+       -@erase "$(INTDIR)\statschannel.obj"
        -@erase "$(INTDIR)\tkeyconf.obj"
        -@erase "$(INTDIR)\tsigconf.obj"
        -@erase "$(INTDIR)\update.obj"
@@ -192,6 +193,7 @@ LINK32_OBJS= \
        "$(INTDIR)\query.obj" \
        "$(INTDIR)\server.obj" \
        "$(INTDIR)\sortlist.obj" \
+       "$(INTDIR)\statschannel.obj" \
        "$(INTDIR)\tkeyconf.obj" \
        "$(INTDIR)\tsigconf.obj" \
        "$(INTDIR)\update.obj" \
@@ -284,6 +286,8 @@ CLEAN :
        -@erase "$(INTDIR)\server.sbr"
        -@erase "$(INTDIR)\sortlist.obj"
        -@erase "$(INTDIR)\sortlist.sbr"
+       -@erase "$(INTDIR)\statschannel.obj"
+       -@erase "$(INTDIR)\statschannel.sbr"
        -@erase "$(INTDIR)\tkeyconf.obj"
        -@erase "$(INTDIR)\tkeyconf.sbr"
        -@erase "$(INTDIR)\tsigconf.obj"
@@ -334,6 +338,7 @@ BSC32_SBRS= \
        "$(INTDIR)\query.sbr" \
        "$(INTDIR)\server.sbr" \
        "$(INTDIR)\sortlist.sbr" \
+       "$(INTDIR)\statschannel.sbr" \
        "$(INTDIR)\tkeyconf.sbr" \
        "$(INTDIR)\tsigconf.sbr" \
        "$(INTDIR)\update.sbr" \
@@ -373,6 +378,7 @@ LINK32_OBJS= \
        "$(INTDIR)\query.obj" \
        "$(INTDIR)\server.obj" \
        "$(INTDIR)\sortlist.obj" \
+       "$(INTDIR)\statschannel.obj" \
        "$(INTDIR)\tkeyconf.obj" \
        "$(INTDIR)\tsigconf.obj" \
        "$(INTDIR)\update.obj" \
@@ -879,6 +885,24 @@ SOURCE=..\sortlist.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\statschannel.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\statschannel.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\statschannel.obj"   "$(INTDIR)\statschannel.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\tkeyconf.c

diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 9b642cf49c35f4f9cb51463eee486f03e8c952ef..22822051c8dda38a5232f70d4be2e5f77b0a8db3 100644 (file)
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -58,6 +58,7 @@ isc_buffer_free
 isc_buffer_getuint16
 isc_buffer_getuint32
 isc_buffer_getuint8
+isc_buffer_reinit
 isc_bufferlist_availablecount
 isc_bufferlist_usedcount
 isc_commandline_parse
@@ -167,6 +168,9 @@ isc_hmacsha512_invalidate
 isc_hmacsha512_sign
 isc_hmacsha512_update
 isc_hmacsha512_verify
+isc_httpdmgr_addurl
+isc_httpdmgr_create
+isc_httpdmgr_shutdown
 isc_interfaceiter_create
 isc_interfaceiter_current
 isc_interfaceiter_destroy

diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index 33769127d958f4e3d17733f5b20059dab7789f50..ec772883aad6825172c86840a3a34ef9d27cb581 100644 (file)
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -297,6 +297,10 @@ SOURCE=..\include\isc\hmacsha.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\include\isc\httpd.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\include\isc\int.h\r
 # End Source File\r
 # Begin Source File\r
@@ -605,6 +609,10 @@ SOURCE=..\hmacsha.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\httpd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\inet_aton.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 11555e9f282e4912c09640e5830f610f75e552bd..f95b69078d0aa8f1902e23fd5323ae88b4418ae9 100644 (file)
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -134,6 +134,7 @@ CLEAN :
        -@erase "$(INTDIR)\hex.obj"
        -@erase "$(INTDIR)\hmacmd5.obj"
        -@erase "$(INTDIR)\hmacsha.obj"
+       -@erase "$(INTDIR)\httpd.obj"
        -@erase "$(INTDIR)\inet_aton.obj"
        -@erase "$(INTDIR)\inet_ntop.obj"
        -@erase "$(INTDIR)\inet_pton.obj"
@@ -240,6 +241,7 @@ LINK32_OBJS= \
        "$(INTDIR)\hex.obj" \
        "$(INTDIR)\hmacmd5.obj" \
        "$(INTDIR)\hmacsha.obj" \
+       "$(INTDIR)\httpd.obj" \
        "$(INTDIR)\inet_aton.obj" \
        "$(INTDIR)\inet_ntop.obj" \
        "$(INTDIR)\inet_pton.obj" \
@@ -332,6 +334,8 @@ CLEAN :
        -@erase "$(INTDIR)\hmacmd5.sbr"
        -@erase "$(INTDIR)\hmacsha.obj"
        -@erase "$(INTDIR)\hmacsha.sbr"
+       -@erase "$(INTDIR)\httpd.obj"
+       -@erase "$(INTDIR)\httpd.sbr"
        -@erase "$(INTDIR)\inet_aton.obj"
        -@erase "$(INTDIR)\inet_aton.sbr"
        -@erase "$(INTDIR)\inet_ntop.obj"
@@ -485,6 +489,7 @@ BSC32_SBRS= \
        "$(INTDIR)\hex.sbr" \
        "$(INTDIR)\hmacmd5.sbr" \
        "$(INTDIR)\hmacsha.sbr" \
+       "$(INTDIR)\httpd.sbr" \
        "$(INTDIR)\inet_aton.sbr" \
        "$(INTDIR)\inet_ntop.sbr" \
        "$(INTDIR)\inet_pton.sbr" \
@@ -565,6 +570,7 @@ LINK32_OBJS= \
        "$(INTDIR)\hex.obj" \
        "$(INTDIR)\hmacmd5.obj" \
        "$(INTDIR)\hmacsha.obj" \
+       "$(INTDIR)\httpd.obj" \
        "$(INTDIR)\inet_aton.obj" \
        "$(INTDIR)\inet_ntop.obj" \
        "$(INTDIR)\inet_pton.obj" \
@@ -1278,6 +1284,24 @@ SOURCE=..\hmacsha.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\httpd.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\httpd.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\httpd.obj"  "$(INTDIR)\httpd.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\inet_aton.c

diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h
index ac2a5f0a4e98b28249e6e610d8040c172ea1056c..54d73876e2371a489e4707adcdb04bd0949ce102 100644 (file)
--- a/lib/isc/win32/unistd.h
+++ b/lib/isc/win32/unistd.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unistd.h,v 1.6 2007/06/19 23:47:19 tbox Exp $ */
+/* $Id: unistd.h,v 1.6.128.1 2008/01/23 02:32:17 each Exp $ */
 
 /* None of these are defined in NT, so define them for our use */
 #define O_NONBLOCK 1
@@ -35,4 +35,19 @@
 
 int fcntl(int, int, ...);
 
+/*
+ * access() related definitions for winXP
+ */
+#include <io.h>
+
+#ifndef W_OK
+#define W_OK 2
+#endif
+
+#ifndef R_OK
+#define R_OK 4
+#endif
+
+#define access _access
+
 #include <process.h>