From b356686ecbece9ffdc071800c7abeaab46571f1e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 23 Jan 2008 03:10:48 +0000 Subject: [PATCH] Fixes needed to compile on windows --- bin/named/win32/named.dsp | 8 ++++++++ bin/named/win32/named.mak | 24 ++++++++++++++++++++++++ lib/isc/win32/libisc.def | 4 ++++ lib/isc/win32/libisc.dsp | 8 ++++++++ lib/isc/win32/libisc.mak | 24 ++++++++++++++++++++++++ lib/isc/win32/unistd.h | 17 ++++++++++++++++- 6 files changed, 84 insertions(+), 1 deletion(-) diff --git a/bin/named/win32/named.dsp b/bin/named/win32/named.dsp index b3388e6ad9..9a2d498192 100644 --- 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 22c9f19245..c50e0a57f8 100644 --- 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 3fd662687d..42cb272b44 100644 --- 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 33769127d9..ec772883aa 100644 --- a/lib/isc/win32/libisc.dsp +++ b/lib/isc/win32/libisc.dsp @@ -297,6 +297,10 @@ SOURCE=..\include\isc\hmacsha.h # End Source File # Begin Source File +SOURCE=..\include\isc\httpd.h +# End Source File +# Begin Source File + SOURCE=.\include\isc\int.h # End Source File # Begin Source File @@ -605,6 +609,10 @@ SOURCE=..\hmacsha.c # End Source File # Begin Source File +SOURCE=..\httpd.c +# End Source File +# Begin Source File + SOURCE=..\inet_aton.c # End Source File # Begin Source File diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak index 11555e9f28..f95b69078d 100644 --- 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 ac2a5f0a4e..b6f04e5432 100644 --- 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.7 2008/01/23 03:10:48 marka 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 + +#ifndef W_OK +#define W_OK 2 +#endif + +#ifndef R_OK +#define R_OK 4 +#endif + +#define access _access + #include