From: Victor Miasnikov <[email protected]> contrib/win32/xorprtm Fixes related "bsdroute.h"
1) Add Or move source code line #include "bsdroute.h" 2) xorptm4/Jamfile ( from "SVN Rev 11384" ) 2b) xorptm6/Jamfile ( see "SharedLibrary xorprtm6 :") 3) build script Jam-Run.cmd == set JAM_TOOLSET=VISUALC jam.exe == Signed-off-by: Victor Miasnikov <[email protected]> --- xorp/contrib/xorprtm/Jam-Run.cmd | Bin 0 -> 777 bytes xorp/contrib/xorprtm/xorprtm/loadprotocol.c | 2 + xorp/contrib/xorprtm/xorprtm/pchsample.h | 4 +- xorp/contrib/xorprtm/xorprtm4/Jamfile | 39 +++++++++++++++++++++++++++ xorp/contrib/xorprtm/xorprtm6/Jamfile | 39 +++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 xorp/contrib/xorprtm/Jam-Run.cmd create mode 100644 xorp/contrib/xorprtm/xorprtm4/Jamfile create mode 100644 xorp/contrib/xorprtm/xorprtm6/Jamfile diff --git a/xorp/contrib/xorprtm/Jam-Run.cmd b/xorp/contrib/xorprtm/Jam-Run.cmd new file mode 100644 index 0000000000000000000000000000000000000000..2f7532374c3888bf6326213e49cd2ce2e41d0e59 GIT binary patch literal 777 xcmXR;Em81t^o<Yk_xA~Q4Y3XL3=VblapvX9O3c+utw`nNVi*OZAu#+y005}13HSg2 literal 0 HcmV?d00001 diff --git a/xorp/contrib/xorprtm/xorprtm/loadprotocol.c b/xorp/contrib/xorprtm/xorprtm/loadprotocol.c index 8c43064..dfbc85a 100644 --- a/xorp/contrib/xorprtm/xorprtm/loadprotocol.c +++ b/xorp/contrib/xorprtm/xorprtm/loadprotocol.c @@ -45,6 +45,8 @@ #include "xorprtm.h" +#include "bsdroute.h" + HRESULT add_protocol_to_rras(int family) { diff --git a/xorp/contrib/xorprtm/xorprtm/pchsample.h b/xorp/contrib/xorprtm/xorprtm/pchsample.h index a6afa8e..b44ea46 100644 --- a/xorp/contrib/xorprtm/xorprtm/pchsample.h +++ b/xorp/contrib/xorprtm/xorprtm/pchsample.h @@ -56,9 +56,9 @@ #include "defs.h" #include "utils.h" +#include "bsdroute.h" + #include "xorprtm_internal.h" #include "mibmgr.h" -#include "bsdroute.h" - #endif diff --git a/xorp/contrib/xorprtm/xorprtm4/Jamfile b/xorp/contrib/xorprtm/xorprtm4/Jamfile new file mode 100644 index 0000000..c9b6beb --- /dev/null +++ b/xorp/contrib/xorprtm/xorprtm4/Jamfile @@ -0,0 +1,39 @@ +# Jamfile + +SubDir TOP ; + +# the /Gz compiler option is required. +# functions requiring stdcall linkage but not declared as such: +#RegisterWaitForSingleObject() +#UnregisterWaitEx () +#QueueUserWorkItem() + +CCFLAGS = + #-DIPV6_DLL + -DINET6 -D__KAME__ + -DTEST + -DNT -DMPR50 + -DDEBUG=999 + -D_CRT_SECURE_NO_DEPRECATE + /Gz ; +LINKLIBS = rtm.lib rtutils.lib mprapi.lib ws2_32.lib advapi32.lib iphlpapi.lib ; + +# +# XXX: We have a problem; we can't currently build both protocol versions +# of the DLL without rearranging the directory structure. +# +SharedLibrary xorprtm4 : xorprtm.c mibmgr.c rmapi.c sync.c utils.c ; + +# Protocol shim activation program. + +Main loadprotocol : loadprotocol.c ; + +# Test programs. + +Main test_monitor : test_monitor.c print_rtmsg.c ; + +Main test_routeadd : test_routeadd.c ; + +Main test_routeadddelete : test_routeadddelete.c print_rtmsg.c ; + +Main test_routeaddwait : test_routeaddwait.c print_rtmsg.c ; diff --git a/xorp/contrib/xorprtm/xorprtm6/Jamfile b/xorp/contrib/xorprtm/xorprtm6/Jamfile new file mode 100644 index 0000000..e03161b --- /dev/null +++ b/xorp/contrib/xorprtm/xorprtm6/Jamfile @@ -0,0 +1,39 @@ +# Jamfile + +SubDir TOP ; + +# the /Gz compiler option is required. +# functions requiring stdcall linkage but not declared as such: +#RegisterWaitForSingleObject() +#UnregisterWaitEx () +#QueueUserWorkItem() + +CCFLAGS = + #-DIPV6_DLL + -DINET6 -D__KAME__ + -DTEST + -DNT -DMPR50 + -DDEBUG=999 + -D_CRT_SECURE_NO_DEPRECATE + /Gz ; +LINKLIBS = rtm.lib rtutils.lib mprapi.lib ws2_32.lib advapi32.lib iphlpapi.lib ; + +# +# XXX: We have a problem; we can't currently build both protocol versions +# of the DLL without rearranging the directory structure. +# +SharedLibrary xorprtm6 : xorprtm.c mibmgr.c rmapi.c sync.c utils.c ; + +# Protocol shim activation program. + +Main loadprotocol : loadprotocol.c ; + +# Test programs. + +Main test_monitor : test_monitor.c print_rtmsg.c ; + +Main test_routeadd : test_routeadd.c ; + +Main test_routeadddelete : test_routeadddelete.c print_rtmsg.c ; + +Main test_routeaddwait : test_routeaddwait.c print_rtmsg.c ; -- 1.7.9.msysgit.0 _______________________________________________ Xorp-hackers mailing list [email protected] http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
