]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Reorganize our copy of libisc code to match BIND 9 tarball layout, preparing
authorDave Hart <hart@ntp.org>
Thu, 24 Sep 2009 07:27:15 +0000 (07:27 +0000)
committerDave Hart <hart@ntp.org>
Thu, 24 Sep 2009 07:27:15 +0000 (07:27 +0000)
for easier drop-in of newer libisc code in the future via a
"ntp-dev-libisc-upstream" repo which gets only unmodified ISC source, and is
pulled into ntp-dev allowing BK to assist with the merge of local changes in
the future.

bk: 4abb1f53O2sX_CTLxMTT2C90UQReiA

114 files changed:
Makefile.am
configure.ac
include/Makefile.am
lib/isc/assertions.c [moved from libisc/assertions.c with 100% similarity]
lib/isc/error.c [moved from libisc/error.c with 100% similarity]
lib/isc/include/isc/Makefile.am [moved from include/isc/Makefile.am with 86% similarity]
lib/isc/include/isc/app.h [moved from include/isc/app.h with 100% similarity]
lib/isc/include/isc/assertions.h [moved from include/isc/assertions.h with 100% similarity]
lib/isc/include/isc/boolean.h [moved from include/isc/boolean.h with 100% similarity]
lib/isc/include/isc/buffer.h [moved from include/isc/buffer.h with 100% similarity]
lib/isc/include/isc/error.h [moved from include/isc/error.h with 100% similarity]
lib/isc/include/isc/file.h [moved from include/isc/file.h with 100% similarity]
lib/isc/include/isc/formatcheck.h [moved from include/isc/formatcheck.h with 100% similarity]
lib/isc/include/isc/interfaceiter.h [moved from include/isc/interfaceiter.h with 100% similarity]
lib/isc/include/isc/ipv6.h [moved from include/isc/ipv6.h with 100% similarity]
lib/isc/include/isc/lang.h [moved from include/isc/lang.h with 100% similarity]
lib/isc/include/isc/lib.h [moved from include/isc/lib.h with 100% similarity]
lib/isc/include/isc/list.h [moved from include/isc/list.h with 100% similarity]
lib/isc/include/isc/log.h [moved from include/isc/log.h with 100% similarity]
lib/isc/include/isc/magic.h [moved from include/isc/magic.h with 100% similarity]
lib/isc/include/isc/md5.h [moved from include/isc/md5.h with 100% similarity]
lib/isc/include/isc/mem.h [moved from include/isc/mem.h with 100% similarity]
lib/isc/include/isc/msgcat.h [moved from include/isc/msgcat.h with 100% similarity]
lib/isc/include/isc/msgs.h [moved from include/isc/msgs.h with 100% similarity]
lib/isc/include/isc/mutex.h [moved from include/isc/mutex.h with 100% similarity]
lib/isc/include/isc/netaddr.h [moved from include/isc/netaddr.h with 100% similarity]
lib/isc/include/isc/netscope.h [moved from include/isc/netscope.h with 100% similarity]
lib/isc/include/isc/once.h [moved from include/isc/once.h with 100% similarity]
lib/isc/include/isc/platform.h [moved from include/isc/platform.h with 100% similarity]
lib/isc/include/isc/print.h [moved from include/isc/print.h with 100% similarity]
lib/isc/include/isc/region.h [moved from include/isc/region.h with 100% similarity]
lib/isc/include/isc/result.h [moved from include/isc/result.h with 100% similarity]
lib/isc/include/isc/sockaddr.h [moved from include/isc/sockaddr.h with 100% similarity]
lib/isc/include/isc/stdio.h [moved from include/isc/stdio.h with 100% similarity]
lib/isc/include/isc/string.h [moved from include/isc/string.h with 100% similarity]
lib/isc/include/isc/types.h [moved from include/isc/types.h with 100% similarity]
lib/isc/include/isc/util.h [moved from include/isc/util.h with 100% similarity]
lib/isc/inet_aton.c [moved from libisc/inet_aton.c with 100% similarity]
lib/isc/inet_ntop.c [moved from libisc/inet_ntop.c with 100% similarity]
lib/isc/inet_pton.c [moved from libisc/inet_pton.c with 100% similarity]
lib/isc/lib.c [moved from libisc/lib.c with 100% similarity]
lib/isc/log.c [moved from libisc/log.c with 100% similarity]
lib/isc/md5.c [moved from libisc/md5.c with 100% similarity]
lib/isc/mem.c [moved from libisc/mem.c with 100% similarity]
lib/isc/netaddr.c [moved from libisc/netaddr.c with 100% similarity]
lib/isc/netscope.c [moved from libisc/netscope.c with 100% similarity]
lib/isc/nls/msgcat.c [moved from libisc/msgcat.c with 100% similarity]
lib/isc/sockaddr.c [moved from libisc/sockaddr.c with 100% similarity]
lib/isc/unix/ifiter_getifaddrs.c [moved from libisc/ifiter_getifaddrs.c with 100% similarity]
lib/isc/unix/ifiter_ioctl.c [moved from libisc/ifiter_ioctl.c with 100% similarity]
lib/isc/unix/ifiter_sysctl.c [moved from libisc/ifiter_sysctl.c with 100% similarity]
lib/isc/unix/include/isc/Makefile.am [new file with mode: 0644]
lib/isc/unix/include/isc/dir.h [moved from include/isc/dir.h with 100% similarity]
lib/isc/unix/include/isc/int.h [moved from include/isc/int.h with 100% similarity]
lib/isc/unix/include/isc/net.h [moved from include/isc/net.h with 100% similarity]
lib/isc/unix/include/isc/offset.h [moved from include/isc/offset.h with 100% similarity]
lib/isc/unix/include/isc/stat.h [moved from include/isc/stat.h with 100% similarity]
lib/isc/unix/include/isc/strerror.h [moved from include/isc/strerror.h with 100% similarity]
lib/isc/unix/include/isc/time.h [moved from include/isc/time.h with 100% similarity]
lib/isc/unix/interfaceiter.c [moved from libisc/interfaceiter.c with 100% similarity]
lib/isc/unix/net.c [moved from libisc/net.c with 100% similarity]
lib/isc/unix/strerror.c [moved from libisc/isc_strerror.c with 100% similarity]
lib/isc/win32/include/isc/int.h [moved from ports/winnt/include/isc/int.h with 100% similarity]
lib/isc/win32/include/isc/ipv6.h [moved from ports/winnt/include/isc/ipv6.h with 100% similarity]
lib/isc/win32/include/isc/mutex.h [moved from ports/winnt/include/isc/mutex.h with 100% similarity]
lib/isc/win32/include/isc/net.h [moved from ports/winnt/include/isc/net.h with 100% similarity]
lib/isc/win32/include/isc/offset.h [moved from ports/winnt/include/isc/offset.h with 100% similarity]
lib/isc/win32/include/isc/once.h [moved from ports/winnt/include/isc/once.h with 100% similarity]
lib/isc/win32/include/isc/platform.h [moved from ports/winnt/include/isc/platform.h with 100% similarity]
lib/isc/win32/include/isc/stat.h [moved from ports/winnt/include/isc/stat.h with 100% similarity]
lib/isc/win32/include/isc/strerror.h [moved from ports/winnt/include/isc/strerror.h with 100% similarity]
lib/isc/win32/include/isc/win32os.h [moved from ports/winnt/include/isc/win32os.h with 100% similarity]
lib/isc/win32/interfaceiter.c [moved from ports/winnt/libisc/interfaceiter.c with 100% similarity]
lib/isc/win32/net.c [moved from ports/winnt/libisc/net.c with 100% similarity]
lib/isc/win32/once.c [moved from ports/winnt/libisc/once.c with 100% similarity]
lib/isc/win32/strerror.c [moved from ports/winnt/libisc/isc_strerror.c with 100% similarity]
lib/isc/win32/win32os.c [moved from ports/winnt/libisc/win32os.c with 100% similarity]
libisc/strerror.c [deleted file]
libntp/Makefile.am
libntp/bsd_strerror.c [moved from libntp/strerror.c with 100% similarity]
libparse/Makefile.am
ntpd/Makefile.am
ntpdate/Makefile.am
ntpdc/Makefile.am
ntpq/Makefile.am
ntpsnmpd/Makefile.am
parseutil/Makefile.am
ports/winnt/libntp/interfaceiter.c [deleted file]
ports/winnt/vc6/libntp.dsp
ports/winnt/vc6/ntpd.dsp
ports/winnt/vc6/ntpdate.dsp
ports/winnt/vc6/ntpdc.dsp
ports/winnt/vc6/ntpkeygen.dsp
ports/winnt/vc6/ntpq.dsp
ports/winnt/vs2003/libntp.vcproj
ports/winnt/vs2003/ntpd.vcproj
ports/winnt/vs2003/ntpdate.vcproj
ports/winnt/vs2003/ntpdc.vcproj
ports/winnt/vs2003/ntpkeygen.vcproj
ports/winnt/vs2003/ntpq.vcproj
ports/winnt/vs2005/libntp.vcproj
ports/winnt/vs2005/ntpd.vcproj
ports/winnt/vs2005/ntpdate.vcproj
ports/winnt/vs2005/ntpdc.vcproj
ports/winnt/vs2005/ntpkeygen.vcproj
ports/winnt/vs2005/ntpq.vcproj
ports/winnt/vs2008/libntp/libntp.vcproj
ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
ports/winnt/vs2008/ntpd/ntpd.vcproj
ports/winnt/vs2008/ntpdate/ntpdate.vcproj
ports/winnt/vs2008/ntpdc/ntpdc.vcproj
ports/winnt/vs2008/ntpq/ntpq.vcproj
sntp/Makefile.am
util/Makefile.am

index 0a7c9237cd53a2f57f3018254c80e216c60ad86c..15da7c03f14ad66ed787beccc60c1c0333e8c994 100644 (file)
@@ -5,10 +5,13 @@ ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
 NULL=
 
 SUBDIRS=
-SUBDIRS+=              \
-       scripts         \
-       include         \
-       ElectricFence   
+SUBDIRS+=                              \
+       scripts                         \
+       include                         \
+       lib/isc/include/isc             \
+       lib/isc/unix/include/isc        \
+       ElectricFence                   \
+       $(NULL)
 if NEED_LIBOPTS
 SUBDIRS+= libopts
 endif
index 562efac8a71325c9153dab97b36b1c3ea7489c29..6eae7bab70443c62c0c437c4c99812a4923d45be 100644 (file)
@@ -4752,9 +4752,10 @@ AC_CONFIG_FILES(ElectricFence/Makefile)
 AC_CONFIG_FILES(adjtimed/Makefile)
 AC_CONFIG_FILES(clockstuff/Makefile)
 AC_CONFIG_FILES(include/Makefile)
-AC_CONFIG_FILES(include/isc/Makefile)
 AC_CONFIG_FILES(kernel/Makefile)
 AC_CONFIG_FILES(kernel/sys/Makefile)
+AC_CONFIG_FILES(lib/isc/include/isc/Makefile)
+AC_CONFIG_FILES(lib/isc/unix/include/isc/Makefile)
 AC_CONFIG_FILES(libntp/Makefile)
 AC_CONFIG_FILES(libparse/Makefile)
 AC_CONFIG_FILES(ntpd/Makefile)
index 675788865efee1788b5886578eff241651e20919..26ae9c6a64fa48b0c5ae6850fb8fcbc8f5f829ab 100644 (file)
@@ -3,8 +3,6 @@ AUTOMAKE_OPTIONS =
 ETAGS_ARGS = $(srcdir)/Makefile.am
 EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def
 
-SUBDIRS = isc
-
 NULL=
 noinst_HEADERS =       \
        adjtime.h       \
similarity index 100%
rename from libisc/assertions.c
rename to lib/isc/assertions.c
similarity index 100%
rename from libisc/error.c
rename to lib/isc/error.c
similarity index 86%
rename from include/isc/Makefile.am
rename to lib/isc/include/isc/Makefile.am
index 9d3474f3d3bb5996b74257dcaf20ec3adedd6fa3..12be5917708871c7e0fb5d04b7a2e506a48d0067 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = 
 ETAGS_ARGS = $(srcdir)/Makefile.am
@@ -8,11 +9,9 @@ noinst_HEADERS = \
        assertions.h \
        boolean.h \
        buffer.h \
-       dir.h \
        error.h \
        file.h \
        formatcheck.h \
-       int.h \
        interfaceiter.h \
        ipv6.h \
        lang.h \
@@ -25,20 +24,16 @@ noinst_HEADERS = \
        msgcat.h \
        msgs.h \
        mutex.h \
-       net.h \
        netaddr.h \
        netscope.h \
-       offset.h \
        once.h \
        platform.h \
        print.h \
        result.h \
        region.h \
        sockaddr.h \
-       stat.h \
        stdio.h \
-       strerror.h \
        string.h \
-       time.h \
        types.h \
-       util.h
+       util.h \
+       $(NULL)
similarity index 100%
rename from include/isc/app.h
rename to lib/isc/include/isc/app.h
similarity index 100%
rename from include/isc/lib.h
rename to lib/isc/include/isc/lib.h
similarity index 100%
rename from include/isc/log.h
rename to lib/isc/include/isc/log.h
similarity index 100%
rename from include/isc/md5.h
rename to lib/isc/include/isc/md5.h
similarity index 100%
rename from include/isc/mem.h
rename to lib/isc/include/isc/mem.h
similarity index 100%
rename from libisc/inet_aton.c
rename to lib/isc/inet_aton.c
similarity index 100%
rename from libisc/inet_ntop.c
rename to lib/isc/inet_ntop.c
similarity index 100%
rename from libisc/inet_pton.c
rename to lib/isc/inet_pton.c
similarity index 100%
rename from libisc/lib.c
rename to lib/isc/lib.c
similarity index 100%
rename from libisc/log.c
rename to lib/isc/log.c
similarity index 100%
rename from libisc/md5.c
rename to lib/isc/md5.c
similarity index 100%
rename from libisc/mem.c
rename to lib/isc/mem.c
similarity index 100%
rename from libisc/netaddr.c
rename to lib/isc/netaddr.c
similarity index 100%
rename from libisc/netscope.c
rename to lib/isc/netscope.c
similarity index 100%
rename from libisc/msgcat.c
rename to lib/isc/nls/msgcat.c
similarity index 100%
rename from libisc/sockaddr.c
rename to lib/isc/sockaddr.c
diff --git a/lib/isc/unix/include/isc/Makefile.am b/lib/isc/unix/include/isc/Makefile.am
new file mode 100644 (file)
index 0000000..7f2f2cd
--- /dev/null
@@ -0,0 +1,15 @@
+NULL=
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+AUTOMAKE_OPTIONS = 
+ETAGS_ARGS = $(srcdir)/Makefile.am
+#EXTRA_DIST = TAGS
+
+noinst_HEADERS = \
+       dir.h \
+       int.h \
+       net.h \
+       offset.h \
+       stat.h \
+       strerror.h \
+       time.h \
+       $(NULL)
similarity index 100%
rename from libisc/net.c
rename to lib/isc/unix/net.c
similarity index 100%
rename from ports/winnt/libisc/net.c
rename to lib/isc/win32/net.c
diff --git a/libisc/strerror.c b/libisc/strerror.c
deleted file mode 100644 (file)
index 4a0f8d8..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: strerror.c,v 1.3 2001/11/20 01:45:45 gson Exp $ */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/mutex.h>
-#include <isc/once.h>
-#include <isc/print.h>
-#include <isc/strerror.h>
-#include <isc/util.h>
-
-#ifdef HAVE_STRERROR
-/*
- * We need to do this this way for profiled locks.
- */
-static isc_mutex_t isc_strerror_lock;
-static void init_lock(void) {
-       RUNTIME_CHECK(isc_mutex_init(&isc_strerror_lock) == ISC_R_SUCCESS);
-}
-#else
-extern const char * const sys_errlist[];
-extern const int sys_nerr;
-#endif
-
-void
-isc__strerror(int num, char *buf, size_t size) {
-#ifdef HAVE_STRERROR
-       char *msg;
-       unsigned int unum = num;
-       static isc_once_t once = ISC_ONCE_INIT;
-
-       REQUIRE(buf != NULL);
-
-       RUNTIME_CHECK(isc_once_do(&once, init_lock) == ISC_R_SUCCESS);
-
-       LOCK(&isc_strerror_lock);
-       msg = strerror(num);
-       if (msg != NULL)
-               snprintf(buf, size, "%s", msg);
-       else
-               snprintf(buf, size, "Unknown error: %u", unum);
-       UNLOCK(&isc_strerror_lock);
-#else
-       unsigned int unum = num;
-
-       REQUIRE(buf != NULL);
-
-       if (num >= 0 && num < sys_nerr)
-               snprintf(buf, size, "%s", sys_errlist[num]);
-       else
-               snprintf(buf, size, "Unknown error: %u", unum);
-#endif
-}
index a7d78a408bd20d005973d8a17d7df490d795e3ee..f13aad00fc02103406edcb0fb29e328a3b7e6a88 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = 
 noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
@@ -12,20 +13,26 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
        mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
        ntp_rfc2553.c numtoa.c numtohost.c octtoint.c prettydate.c \
        ntp_random.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
-       statestr.c strdup.c strerror.c strstr.c \
+       statestr.c strdup.c bsd_strerror.c strstr.c \
        syssignal.c tsftomsu.c tstotv.c tvtots.c \
        uglydate.c uinttoa.c ymd2yd.c \
-       $(srcdir)/../libisc/assertions.c $(srcdir)/../libisc/error.c \
-       $(srcdir)/../libisc/interfaceiter.c $(srcdir)/../libisc/lib.c \
-       $(srcdir)/../libisc/md5.c $(srcdir)/../libisc/msgcat.c \
-       $(srcdir)/../libisc/net.c $(srcdir)/../libisc/isc_strerror.c \
-       $(srcdir)/../libisc/inet_ntop.c $(srcdir)/../libisc/inet_pton.c \
-       $(srcdir)/../libisc/netaddr.c $(srcdir)/../libisc/sockaddr.c \
-       $(srcdir)/../libisc/netscope.c
+       $(srcdir)/../lib/isc/assertions.c $(srcdir)/../lib/isc/error.c \
+       $(srcdir)/../lib/isc/unix/interfaceiter.c $(srcdir)/../lib/isc/lib.c \
+       $(srcdir)/../lib/isc/md5.c $(srcdir)/../lib/isc/nls/msgcat.c \
+       $(srcdir)/../lib/isc/unix/net.c $(srcdir)/../lib/isc/unix/strerror.c \
+       $(srcdir)/../lib/isc/inet_ntop.c $(srcdir)/../lib/isc/inet_pton.c \
+       $(srcdir)/../lib/isc/netaddr.c $(srcdir)/../lib/isc/sockaddr.c \
+       $(srcdir)/../lib/isc/netscope.c
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
 EXTRA_libntp_a_SOURCES = adjtimex.c
-INCLUDES = -I$(top_srcdir)/include -I../include
+INCLUDES =     -I$(top_srcdir)/include                 \
+               -I../include                            \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I../lib/isc/include                    \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               -I../lib/isc/unix/include               \
+               $(NULL)
 ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h 
similarity index 100%
rename from libntp/strerror.c
rename to libntp/bsd_strerror.c
index 4143b58f2d04615b0c9f72b101210d9516bc209d..b0d5ebf33121422f8157ae8f298cdd9a32cb4d5f 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = 
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
@@ -49,7 +50,11 @@ libparse_kernel_a_LIBADD = kparse$U.o \
                            kgpstolfp$U.o
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/kernel
+INCLUDES =     -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               -I$(top_srcdir)/kernel                  \
+               $(NULL)
 ETAGS_ARGS = Makefile.am
 
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
index 4f408cc155d5c01a01f2ff026c4900f78a6c48e9..d8a0268b51da7b6b304b2d7a43358843bbeb4a38 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 AUTOMAKE_OPTIONS= 
 
 bindir=        ${exec_prefix}/${BINSUBDIR}
@@ -6,7 +7,14 @@ bin_PROGRAMS=  ntpd @MAKE_NTPDSIM@
 
 noinst_LIBRARIES=      libntpd.a
 
-AM_CPPFLAGS= -I$(top_srcdir)/include -I../include $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS=   -I$(top_srcdir)/include                 \
+               -I../include                            \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I../lib/isc/include                    \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               -I../lib/isc/unix/include               \
+               $(LIBOPTS_CFLAGS)                       \
+               $(NULL)
 # LDADD might need RESLIB and ADJLIB.
 LDADD= version.o libntpd.a @LIBPARSE@
 AM_YFLAGS=     -d -t -r all
index b58048ea57b2320df35e041cc93f30c7c202128c..ffe2f430d38a30a6fa603c5a2ea3b578e95b7b1e 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 AUTOMAKE_OPTIONS=      
 
 bindir=                ${exec_prefix}/${BINSUBDIR}
@@ -6,7 +7,10 @@ bin_PROGRAMS=  ntpdate
 EXTRA_PROGRAMS=        ntptimeset
 
 ntptimeset_SOURCES=    ntptimeset.c ntptime_config.c
-AM_CPPFLAGS=   -I$(top_srcdir)/include
+AM_CPPFLAGS=   -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               $(NULL)
 # LDADD might need RESLIB and ADJLIB
 LDADD=         version.o ../libntp/libntp.a
 DISTCLEANFILES=        .version version.c stamp-v
index 68d9bb600948723a0783c364bc7244acb907981f..6c908a2bb181d666c722376f2e58957eb7f152bf 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 AUTOMAKE_OPTIONS=      
 
 bindir=                ${exec_prefix}/${BINSUBDIR}
@@ -5,7 +6,11 @@ bin_PROGRAMS=  ntpdc
 EXTRA_PROGRAMS=        ntpdc-layout
 EXTRA_DATA=    check-layout
 BUILT_SOURCES= @MAKE_CHECK_LAYOUT@
-AM_CPPFLAGS=   -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS=   -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               $(LIBOPTS_CFLAGS)                       \
+               $(NULL)
 # LDADD might need RESLIB and ADJLIB
 ntpdc_LDADD=   version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
 # ntpdc-layout doesn't need any additional libraries at all
index 6fd5ab11310a01b1ba52662fbc04c17817128ca3..ec6e2522f2788793b410359b7255256c06345626 100644 (file)
@@ -1,7 +1,12 @@
+NULL=
 AUTOMAKE_OPTIONS=      
 
 bin_PROGRAMS=  ntpq
-AM_CPPFLAGS=   -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS=   -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               $(LIBOPTS_CFLAGS)                       \
+               $(NULL)
 # LDADD might need RESLIB and ADJLIB
 ntpq_LDADD=    version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
 noinst_HEADERS=        ntpq.h
index 82cb4bc94a96fc424ec88b06bb65556188aedcb7..4843c67739a1668c45ac77787b1c2c128f0b79de 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 AUTOMAKE_OPTIONS= 
 
 sbin_PROGRAMS= @MAKE_NTPSNMPD@
@@ -8,8 +9,13 @@ noinst_HEADERS=        ntpSnmpSubagentObject.h
 # HMS: we probably want a version.o file here, too.
 LDADD=         ../ntpq/libntpq.a ../libntp/libntp.a @SNMP_LIBS@        \
                $(LIBOPTS_LDADD)
-AM_CPPFLAGS=   -I$(top_srcdir)/ntpq -I$(top_srcdir)/include @SNMP_CPPFLAGS@ \
-               $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS=   -I$(top_srcdir)/ntpq                    \
+               -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               @SNMP_CPPFLAGS@                         \
+               $(LIBOPTS_CFLAGS)                       \
+               $(NULL)
 AM_CFLAGS=     @SNMP_CFLAGS@
 EXTRA_DIST=    ntpsnmpd-opts.def ntpsnmpd.1 ntpsnmpd-opts.texi \
                ntpsnmpd-opts.menu ntpv4-mib.mib
index 0e6aaf022fc44d87dc894fe3b6cd6b5d1dcb39ca..ff70f4fb80b9202de9ab6742f9052f8845742889 100644 (file)
@@ -1,8 +1,12 @@
+NULL=
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = 
 noinst_PROGRAMS = @TESTDCF@ @DCFD@
 EXTRA_PROGRAMS = testdcf dcfd
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES =     -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               $(NULL)
 ETAGS_ARGS = Makefile.am
 DISTCLEANFILES = $(EXTRA_PROGRAMS)
 #EXTRA_DIST= TAGS
diff --git a/ports/winnt/libntp/interfaceiter.c b/ports/winnt/libntp/interfaceiter.c
deleted file mode 100644 (file)
index a69b702..0000000
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: interfaceiter.c,v 1.13.110.2 2009/01/18 23:47:41 tbox Exp $ */
-
-/*
- * Note that this code will need to be revisited to support IPv6 Interfaces.
- * For now we just iterate through IPv4 interfaces.
- */
-
-#include <config.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <isc/interfaceiter.h>
-#include <isc/mem.h>
-#include <isc/result.h>
-#include <isc/string.h>
-#include <isc/strerror.h>
-#include <isc/types.h>
-#include <isc/util.h>
-
-void InitSockets(void);
-
-/* Common utility functions */
-
-/*
- * Extract the network address part from a "struct sockaddr".
- *
- * The address family is given explicitly
- * instead of using src->sa_family, because the latter does not work
- * for copying a network mask obtained by SIOCGIFNETMASK (it does
- * not have a valid address family).
- */
-
-
-#define IFITER_MAGIC           0x49464954U     /* IFIT. */
-#define VALID_IFITER(t)                ((t) != NULL && (t)->magic == IFITER_MAGIC)
-
-struct isc_interfaceiter {
-       unsigned int            magic;          /* Magic number. */
-       isc_mem_t               *mctx;
-       int                     socket;
-       INTERFACE_INFO          IFData;         /* Current Interface Info */
-       int                     numIF;          /* Current Interface count */
-       int                     v4IF;           /* Number of IPv4 Interfaces */
-       INTERFACE_INFO          *buf4;          /* Buffer for WSAIoctl data. */
-       unsigned int            buf4size;       /* Bytes allocated. */
-       INTERFACE_INFO          *pos4;          /* Current offset in IF List */
-       SOCKET_ADDRESS_LIST     *buf6;
-       unsigned int            buf6size;       /* Bytes allocated. */
-       unsigned int            pos6;
-       isc_interface_t         current;        /* Current interface data. */
-       isc_result_t            result;         /* Last result code. */
-};
-
-
-/*
- * Size of buffer for SIO_GET_INTERFACE_LIST, in number of interfaces.
- * We assume no sane system will have more than than 1K of IP addresses on
- * all of its adapters.
- */
-#define IFCONF_SIZE_INITIAL      16
-#define IFCONF_SIZE_INCREMENT    64
-#define IFCONF_SIZE_MAX                1040
-
-static void
-get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
-       dst->family = family;
-       switch (family) {
-       case AF_INET:
-               memcpy(&dst->type.in,
-                      &((struct sockaddr_in *) src)->sin_addr,
-                      sizeof(struct in_addr));
-               break;
-       case    AF_INET6:
-               memcpy(&dst->type.in6,
-                      &((struct sockaddr_in6 *) src)->sin6_addr,
-                      sizeof(struct in6_addr));
-               dst->zone = ((struct sockaddr_in6 *) src)->sin6_scope_id;
-               break;
-       default:
-               INSIST(0);
-               break;
-       }
-}
-
-isc_result_t
-isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
-       char strbuf[ISC_STRERRORSIZE];
-       isc_interfaceiter_t *iter;
-       isc_result_t result;
-       int error;
-       unsigned long bytesReturned = 0;
-
-       REQUIRE(mctx != NULL);
-       REQUIRE(iterp != NULL);
-       REQUIRE(*iterp == NULL);
-
-       iter = isc_mem_get(mctx, sizeof(*iter));
-       if (iter == NULL)
-               return (ISC_R_NOMEMORY);
-
-       InitSockets();
-
-       iter->mctx = mctx;
-       iter->buf4 = NULL;
-       iter->buf6 = NULL;
-       iter->pos4 = NULL;
-       iter->pos6 = 0;
-       iter->buf6size = 0;
-       iter->buf4size = 0;
-       iter->result = ISC_R_FAILURE;
-       iter->numIF = 0;
-       iter->v4IF = 0;
-
-       /*
-        * Create an unbound datagram socket to do the
-        * SIO_GET_INTERFACE_LIST WSAIoctl on.
-        */
-       if ((iter->socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-               error = WSAGetLastError();
-               if (error == WSAEAFNOSUPPORT)
-                       goto inet6_only;
-               isc__strerror(error, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                               "making interface scan socket: %s",
-                               strbuf);
-               result = ISC_R_UNEXPECTED;
-               goto socket_failure;
-       }
-
-       /*
-        * Get the interface configuration, allocating more memory if
-        * necessary.
-        */
-       iter->buf4size = IFCONF_SIZE_INITIAL*sizeof(INTERFACE_INFO);
-
-       for (;;) {
-               iter->buf4 = isc_mem_get(mctx, iter->buf4size);
-               if (iter->buf4 == NULL) {
-                       result = ISC_R_NOMEMORY;
-                       goto alloc_failure;
-               }
-
-               if (WSAIoctl(iter->socket, SIO_GET_INTERFACE_LIST,
-                            0, 0, iter->buf4, iter->buf4size,
-                            &bytesReturned, 0, 0) == SOCKET_ERROR)
-               {
-                       error = WSAGetLastError();
-                       if (error != WSAEFAULT && error != WSAENOBUFS) {
-                               errno = error;
-                               isc__strerror(error, strbuf, sizeof(strbuf));
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                               "get interface configuration: %s",
-                                               strbuf);
-                               result = ISC_R_UNEXPECTED;
-                               goto ioctl_failure;
-                       }
-                       /*
-                        * EINVAL.  Retry with a bigger buffer.
-                        */
-               } else {
-                       /*
-                        * The WSAIoctl succeeded.
-                        * If the number of the returned bytes is the same
-                        * as the buffer size, we will grow it just in
-                        * case and retry.
-                        */
-                       if (bytesReturned > 0 &&
-                           (bytesReturned < iter->buf4size))
-                               break;
-               }
-               if (iter->buf4size >= IFCONF_SIZE_MAX*sizeof(INTERFACE_INFO)) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "get interface configuration: "
-                                        "maximum buffer size exceeded");
-                       result = ISC_R_UNEXPECTED;
-                       goto ioctl_failure;
-               }
-               isc_mem_put(mctx, iter->buf4, iter->buf4size);
-
-               iter->buf4size += IFCONF_SIZE_INCREMENT *
-                       sizeof(INTERFACE_INFO);
-       }
-
-       /*
-        * A newly created iterator has an undefined position
-        * until isc_interfaceiter_first() is called.
-        */
-       iter->v4IF = bytesReturned/sizeof(INTERFACE_INFO);
-
-       /* We don't need the socket any more, so close it */
-       closesocket(iter->socket);
-
- inet6_only:
-       /*
-        * Create an unbound datagram socket to do the
-        * SIO_ADDRESS_LIST_QUERY WSAIoctl on.
-        */
-       if ((iter->socket = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-               error = WSAGetLastError();
-               if (error == WSAEAFNOSUPPORT)
-                       goto inet_only;
-               isc__strerror(error, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                               "making interface scan socket: %s",
-                               strbuf);
-               result = ISC_R_UNEXPECTED;
-               goto ioctl_failure;
-       }
-
-       /*
-        * Get the interface configuration, allocating more memory if
-        * necessary.
-        */
-       iter->buf6size = sizeof(SOCKET_ADDRESS_LIST) +
-                        IFCONF_SIZE_INITIAL*sizeof(SOCKET_ADDRESS);
-
-       for (;;) {
-               iter->buf6 = isc_mem_get(mctx, iter->buf6size);
-               if (iter->buf6 == NULL) {
-                       result = ISC_R_NOMEMORY;
-                       goto ioctl_failure;
-               }
-
-               if (WSAIoctl(iter->socket, SIO_ADDRESS_LIST_QUERY,
-                            0, 0, iter->buf6, iter->buf6size,
-                            &bytesReturned, 0, 0) == SOCKET_ERROR)
-               {
-                       error = WSAGetLastError();
-                       if (error != WSAEFAULT && error != WSAENOBUFS) {
-                               errno = error;
-                               isc__strerror(error, strbuf, sizeof(strbuf));
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                "sio address list query: %s",
-                                                strbuf);
-                               result = ISC_R_UNEXPECTED;
-                               goto ioctl6_failure;
-                       }
-                       /*
-                        * EINVAL.  Retry with a bigger buffer.
-                        */
-               } else
-                       break;
-
-               if (iter->buf6size >= IFCONF_SIZE_MAX*sizeof(SOCKET_ADDRESS)) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "get interface configuration: "
-                                        "maximum buffer size exceeded");
-                       result = ISC_R_UNEXPECTED;
-                       goto ioctl6_failure;
-               }
-               isc_mem_put(mctx, iter->buf6, iter->buf6size);
-
-               iter->buf6size += IFCONF_SIZE_INCREMENT *
-                       sizeof(SOCKET_ADDRESS);
-       }
-
-       closesocket(iter->socket);
-
- inet_only:
-       iter->magic = IFITER_MAGIC;
-       *iterp = iter;
-       return (ISC_R_SUCCESS);
-
- ioctl6_failure:
-       isc_mem_put(mctx, iter->buf6, iter->buf6size);
-
- ioctl_failure:
-       if (iter->buf4 != NULL)
-               isc_mem_put(mctx, iter->buf4, iter->buf4size);
-
- alloc_failure:
-       if (iter->socket >= 0)
-               (void) closesocket(iter->socket);
-
- socket_failure:
-       isc_mem_put(mctx, iter, sizeof(*iter));
-       return (result);
-}
-
-/*
- * Get information about the current interface to iter->current.
- * If successful, return ISC_R_SUCCESS.
- * If the interface has an unsupported address family, or if
- * some operation on it fails, return ISC_R_IGNORE to make
- * the higher-level iterator code ignore it.
- */
-
-static isc_result_t
-internal_current(isc_interfaceiter_t *iter) {
-       BOOL ifNamed = FALSE;
-       unsigned long flags;
-
-       REQUIRE(VALID_IFITER(iter));
-       REQUIRE(iter->numIF >= 0);
-
-       memset(&iter->current, 0, sizeof(iter->current));
-       iter->current.af = AF_INET;
-
-       get_addr(AF_INET, &iter->current.address,
-                (struct sockaddr *)&(iter->IFData.iiAddress));
-
-       /*
-        * Get interface flags.
-        */
-
-       iter->current.flags = 0;
-       flags = iter->IFData.iiFlags;
-
-       if ((flags & IFF_UP) != 0)
-               iter->current.flags |= INTERFACE_F_UP;
-
-       if ((flags & IFF_POINTTOPOINT) != 0) {
-               iter->current.flags |= INTERFACE_F_POINTTOPOINT;
-               sprintf(iter->current.name, "PPP Interface %d", iter->numIF);
-               ifNamed = TRUE;
-       }
-
-       if ((flags & IFF_LOOPBACK) != 0) {
-               iter->current.flags |= INTERFACE_F_LOOPBACK;
-               sprintf(iter->current.name, "Loopback Interface %d",
-                       iter->numIF);
-               ifNamed = TRUE;
-       }
-
-       /*
-        * If the interface is point-to-point, get the destination address.
-        */
-       if ((iter->current.flags & INTERFACE_F_POINTTOPOINT) != 0) {
-               get_addr(AF_INET, &iter->current.dstaddress,
-               (struct sockaddr *)&(iter->IFData.iiBroadcastAddress));
-       }
-
-       if (ifNamed == FALSE)
-               sprintf(iter->current.name,
-                       "TCP/IP Interface %d", iter->numIF);
-
-       /*
-        * Get the network mask.
-        */
-       get_addr(AF_INET, &iter->current.netmask,
-                (struct sockaddr *)&(iter->IFData.iiNetmask));
-
-       return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-internal_current6(isc_interfaceiter_t *iter) {
-       BOOL ifNamed = FALSE;
-       int i;
-
-       REQUIRE(VALID_IFITER(iter));
-       REQUIRE(iter->pos6 >= 0);
-       REQUIRE(iter->buf6 != 0);
-
-       memset(&iter->current, 0, sizeof(iter->current));
-       iter->current.af = AF_INET6;
-
-       get_addr(AF_INET6, &iter->current.address,
-                iter->buf6->Address[iter->pos6].lpSockaddr);
-
-       /*
-        * Get interface flags.
-        */
-
-       iter->current.flags = INTERFACE_F_UP;
-
-       if (ifNamed == FALSE)
-               sprintf(iter->current.name,
-                       "TCP/IPv6 Interface %d", iter->pos6 + 1);
-
-       for (i = 0; i< 16; i++)
-               iter->current.netmask.type.in6.s6_addr[i] = 0xff;
-       iter->current.netmask.family = AF_INET6;
-       return (ISC_R_SUCCESS);
-}
-
-/*
- * Step the iterator to the next interface.  Unlike
- * isc_interfaceiter_next(), this may leave the iterator
- * positioned on an interface that will ultimately
- * be ignored.  Return ISC_R_NOMORE if there are no more
- * interfaces, otherwise ISC_R_SUCCESS.
- */
-static isc_result_t
-internal_next(isc_interfaceiter_t *iter) {
-       if (iter->numIF >= iter->v4IF)
-               return (ISC_R_NOMORE);
-
-       /*
-        * The first one needs to be set up to point to the last
-        * Element of the array.  Go to the end and back up
-        * Microsoft's implementation is peculiar for returning
-        * the list in reverse order
-        */
-
-       if (iter->numIF == 0)
-               iter->pos4 = (INTERFACE_INFO *)(iter->buf4 + (iter->v4IF));
-
-       iter->pos4--;
-       if (&(iter->pos4) < &(iter->buf4))
-               return (ISC_R_NOMORE);
-
-       memset(&(iter->IFData), 0, sizeof(INTERFACE_INFO));
-       memcpy(&(iter->IFData), iter->pos4, sizeof(INTERFACE_INFO));
-       iter->numIF++;
-
-       return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-internal_next6(isc_interfaceiter_t *iter) {
-       if (iter->pos6 == 0)
-               return (ISC_R_NOMORE);
-       iter->pos6--;
-       return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-isc_interfaceiter_current(isc_interfaceiter_t *iter,
-                         isc_interface_t *ifdata) {
-       REQUIRE(iter->result == ISC_R_SUCCESS);
-       memcpy(ifdata, &iter->current, sizeof(*ifdata));
-       return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-isc_interfaceiter_first(isc_interfaceiter_t *iter) {
-
-       REQUIRE(VALID_IFITER(iter));
-
-       if (iter->buf6 != NULL)
-               iter->pos6 = iter->buf6->iAddressCount;
-       iter->result = ISC_R_SUCCESS;
-       return (isc_interfaceiter_next(iter));
-}
-
-isc_result_t
-isc_interfaceiter_next(isc_interfaceiter_t *iter) {
-       isc_result_t result;
-
-       REQUIRE(VALID_IFITER(iter));
-       REQUIRE(iter->result == ISC_R_SUCCESS);
-
-       for (;;) {
-               result = internal_next(iter);
-               if (result == ISC_R_NOMORE) {
-                       result = internal_next6(iter);
-                       if (result != ISC_R_SUCCESS)
-                               break;
-                       result = internal_current6(iter);
-                       if (result != ISC_R_IGNORE)
-                               break;
-               } else if (result != ISC_R_SUCCESS)
-                       break;
-               result = internal_current(iter);
-               if (result != ISC_R_IGNORE)
-                       break;
-       }
-       iter->result = result;
-       return (result);
-}
-
-void
-isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) {
-       isc_interfaceiter_t *iter;
-       REQUIRE(iterp != NULL);
-       iter = *iterp;
-       REQUIRE(VALID_IFITER(iter));
-
-       if (iter->buf4 != NULL)
-               isc_mem_put(iter->mctx, iter->buf4, iter->buf4size);
-       if (iter->buf6 != NULL)
-               isc_mem_put(iter->mctx, iter->buf6, iter->buf6size);
-
-       iter->magic = 0;
-       isc_mem_put(iter->mctx, iter, sizeof(*iter));
-       *iterp = NULL;
-}
index 9dca3dd88b63f99354cd2c953ff19645a1b0735f..0eeeac6bec0f83ca870aa22f42e11b6c53722a41 100644 (file)
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "libntp\Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "libntp\Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -102,7 +102,7 @@ SOURCE=..\..\..\libntp\adjtime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\assertions.c
+SOURCE=..\..\..\lib\isc\assertions.c
 # End Source File
 # Begin Source File
 
@@ -174,7 +174,7 @@ SOURCE=..\..\..\libntp\emalloc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\error.c
+SOURCE=..\..\..\lib\isc\error.c
 # End Source File
 # Begin Source File
 
@@ -206,19 +206,19 @@ SOURCE=..\..\..\libntp\humandate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\inet_aton.c
+SOURCE=..\..\..\lib\isc\inet_aton.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\inet_ntop.c
+SOURCE=..\..\..\lib\isc\inet_ntop.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\inet_pton.c
+SOURCE=..\..\..\lib\isc\inet_pton.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libisc\interfaceiter.c
+SOURCE=..\..\..\lib\isc\win32\interfaceiter.c
 # End Source File
 # Begin Source File
 
@@ -230,11 +230,11 @@ SOURCE=..\..\..\libntp\iosignal.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libisc\isc_strerror.c
+SOURCE=..\..\..\lib\isc\win32\strerror.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\lib.c
+SOURCE=..\..\..\lib\isc\lib.c
 # End Source File
 # Begin Source File
 
@@ -250,7 +250,7 @@ SOURCE=..\..\..\libntp\machines.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\md5.c
+SOURCE=..\..\..\lib\isc\md5.c
 # End Source File
 # Begin Source File
 
@@ -274,7 +274,7 @@ SOURCE=..\..\..\libntp\modetoa.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\msgcat.c
+SOURCE=..\..\..\lib\isc\nls\msgcat.c
 # End Source File
 # Begin Source File
 
@@ -290,11 +290,11 @@ SOURCE=..\..\..\libntp\msyslog.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libisc\net.c
+SOURCE=..\..\..\lib\isc\win32\net.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\netaddr.c
+SOURCE=..\..\..\lib\isc\netaddr.c
 # End Source File
 # Begin Source File
 
@@ -302,7 +302,7 @@ SOURCE=..\..\..\libntp\netof.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\netscope.c
+SOURCE=..\..\..\lib\isc\netscope.c
 # End Source File
 # Begin Source File
 
@@ -330,7 +330,7 @@ SOURCE=..\..\..\libntp\octtoint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libisc\once.c
+SOURCE=..\..\..\lib\isc\win32\once.c
 # End Source File
 # Begin Source File
 
@@ -354,7 +354,7 @@ SOURCE=..\libntp\SetSystemTime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libisc\sockaddr.c
+SOURCE=..\..\..\lib\isc\sockaddr.c
 # End Source File
 # Begin Source File
 
@@ -410,7 +410,7 @@ SOURCE=..\libntp\util_clockstuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libisc\win32os.c
+SOURCE=..\..\..\lib\isc\win32\win32os.c
 # End Source File
 # Begin Source File
 
index a18e597350e1aa0325cdda6e7152be1354441e35..e216669344096bff51bc87c400902e85f13ed476 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
index 98e0df73642bc59b91e21ad3b6b5ec84cbbab5a9..71ba703fd581a9e87cde494446d50e6e168609fc 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
index 39c173b8d1de0458b076f96c474b11b73a5ca6f8..b918a55a19e81ebbc3ee82d4ad9a2e59075dbb60 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX"windows.h" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX"windows.h" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
index d45e646bb65ab7aef8a2a885011fe40e1dc238f1..026744eb34c5b8026d1f1382743b9f3bac2130bf 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
index eaea563f834e4cbfedcd26299a1df3aabdd96623..fa24226ce3250e06d2b4933523788b05c1f6ca73 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
index 0d1c3d034d6b5d22c4b99dd1c0909e41d6c95377..5d374d2db0404c5de13bcbaf9e64422229e60d60 100644 (file)
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -73,7 +73,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\assertions.c">
+                               RelativePath="..\..\..\lib\isc\assertions.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\error.c">
+                               RelativePath="..\..\..\lib\isc\error.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_aton.c">
+                               RelativePath="..\..\..\lib\isc\inet_aton.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_ntop.c">
+                               RelativePath="..\..\..\lib\isc\inet_ntop.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_pton.c">
+                               RelativePath="..\..\..\lib\isc\inet_pton.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\interfaceiter.c">
+                               RelativePath="..\..\..\lib\isc\win32\interfaceiter.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\isc_strerror.c">
+                               RelativePath="..\..\..\lib\isc\win32\strerror.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\lib.c">
+                               RelativePath="..\..\..\lib\isc\lib.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\md5.c">
+                               RelativePath="..\..\..\lib\isc\md5.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\msgcat.c">
+                               RelativePath="..\..\..\lib\isc\nls\msgcat.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\net.c">
+                               RelativePath="..\..\..\lib\isc\win32\net.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\netaddr.c">
+                               RelativePath="..\..\..\lib\isc\netaddr.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\netscope.c">
+                               RelativePath="..\..\..\lib\isc\netscope.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\once.c">
+                               RelativePath="..\..\..\lib\isc\win32\once.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\sockaddr.c">
+                               RelativePath="..\..\..\lib\isc\sockaddr.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\win32os.c">
+                               RelativePath="..\..\..\lib\isc\win32\win32os.c">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
index 6196e0b4fd5a76eb1ab3cb8aa5591c3fda29dc65..fe0f473667c0d7fd308b08f682881bc43dc8ba1a 100644 (file)
@@ -22,7 +22,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -84,7 +84,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
index 86164ff847764ca00fe60ac49c537ab80ddf5fa6..979d2195af229c7846b55cf23d5d91081654be72 100644 (file)
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -84,7 +84,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
index 9c13c8dd548f4c915c4f3352c121b697a39b7bbf..2a5e4fa1f2c3ecf4d06729778f10e9901d5e30ef 100644 (file)
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -85,7 +85,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
index 7937545740cf3abb544a5a7d0ff65c608cc91275..d84618b41183b5658fedb9bd4090e84910309778 100644 (file)
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -84,7 +84,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
index 032c40e41eb08a1f910e77e912ec983090958376..39ccb68018709e58597c689b8d46b7fcf1275626 100644 (file)
@@ -22,7 +22,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -82,7 +82,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
index 1ad248e63d37fefa2ef3d49306bd15c95c45865b..f00eba1b8c2109bcca90f8aa78a16ba834ebd724 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\assertions.c"
+                               RelativePath="..\..\..\lib\isc\assertions.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\error.c"
+                               RelativePath="..\..\..\lib\isc\error.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_aton.c"
+                               RelativePath="..\..\..\lib\isc\inet_aton.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_ntop.c"
+                               RelativePath="..\..\..\lib\isc\inet_ntop.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\inet_pton.c"
+                               RelativePath="..\..\..\lib\isc\inet_pton.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\interfaceiter.c"
+                               RelativePath="..\..\..\lib\isc\win32\interfaceiter.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\isc_strerror.c"
+                               RelativePath="..\..\..\lib\isc\win32\strerror.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\lib.c"
+                               RelativePath="..\..\..\lib\isc\lib.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\md5.c"
+                               RelativePath="..\..\..\lib\isc\md5.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\msgcat.c"
+                               RelativePath="..\..\..\lib\isc\nls\msgcat.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\net.c"
+                               RelativePath="..\..\..\lib\isc\win32\net.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\netaddr.c"
+                               RelativePath="..\..\..\lib\isc\netaddr.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\netscope.c"
+                               RelativePath="..\..\..\lib\isc\netscope.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\once.c"
+                               RelativePath="..\..\..\lib\isc\win32\once.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\libisc\sockaddr.c"
+                               RelativePath="..\..\..\lib\isc\sockaddr.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\libisc\win32os.c"
+                               RelativePath="..\..\..\lib\isc\win32\win32os.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
index ae7779a142d43b0751363a72dc6cb640c0fa8174..c2223f9ecffa3b64dddfe25c4731537f8ed10931 100644 (file)
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
index 13fef2546a9ba2b0be4e5f2baa92adeb56942084..b65f80a62972fddbf66b7ad2f58c73e27d8ab360 100644 (file)
@@ -43,7 +43,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index e36e440a02f2c9f1be26d4a5a3f2eafd5f369c64..0a5c1a42ecd490208338ae6bc5933aacc51c45e3 100644 (file)
@@ -43,7 +43,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 530e1c1cb591483f6adec4a846c5b8446b496b44..00c1df5578d11baebb6f6063254f69d2abd7701e 100644 (file)
@@ -43,7 +43,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index f9c74d7b34c350c5b42be449e8a828e54654202b..66f87045e994f18b8a7b9df33d0b681dd8230cd3 100644 (file)
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL_INC),..\..\..\libopts"
+                               AdditionalIncludeDirectories=".,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
index 59b013cf92dc616247acab8b52bc5f6c069072f1..f850f8da27f4d4b1327e473edc802eb835e85250 100644 (file)
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\libntp,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H"
                                GeneratePreprocessedFile="0"
                                StringPooling="true"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\assertions.c"
+                               RelativePath="..\..\..\..\lib\isc\assertions.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\error.c"
+                               RelativePath="..\..\..\..\lib\isc\error.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\inet_aton.c"
+                               RelativePath="..\..\..\..\lib\isc\inet_aton.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\inet_ntop.c"
+                               RelativePath="..\..\..\..\lib\isc\inet_ntop.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\inet_pton.c"
+                               RelativePath="..\..\..\..\lib\isc\inet_pton.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\libisc\interfaceiter.c"
+                               RelativePath="..\..\..\..\lib\isc\win32\interfaceiter.c"
                                >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
                        </File>
                        <File
                                RelativePath="..\..\..\..\libntp\inttoa.c"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\libisc\isc_strerror.c"
+                               RelativePath="..\..\..\..\lib\isc\win32\strerror.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\lib.c"
+                               RelativePath="..\..\..\..\lib\isc\lib.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\md5.c"
+                               RelativePath="..\..\..\..\lib\isc\md5.c"
                                >
                        </File>
                        <File
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\msgcat.c"
+                               RelativePath="..\..\..\..\lib\isc\nls\msgcat.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\libisc\net.c"
+                               RelativePath="..\..\..\..\lib\isc\win32\net.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\netaddr.c"
+                               RelativePath="..\..\..\..\lib\isc\netaddr.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\netscope.c"
+                               RelativePath="..\..\..\..\lib\isc\netscope.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\libisc\once.c"
+                               RelativePath="..\..\..\..\lib\isc\win32\once.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\..\..\libisc\sockaddr.c"
+                               RelativePath="..\..\..\..\lib\isc\sockaddr.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\libisc\win32os.c"
+                               RelativePath="..\..\..\..\lib\isc\win32\win32os.c"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
index d79acc152657511c3ea6e7b07532dd7fe043c54c..91bcf2ee942158c357820a0eb51d49a2ecb3195b 100644 (file)
@@ -47,7 +47,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntp-keygen,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 3f1585eb0bb2799b311f3bff7fee66707996cdb3..8c2bce81c8ebb2c79a773c801d53c4c6ea68d4d1 100644 (file)
@@ -50,7 +50,7 @@
                                EnableIntrinsicFunctions="true"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H"
                                StringPooling="true"
                                ExceptionHandling="0"
                                EnableIntrinsicFunctions="true"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpd,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
                        </File>
                </Filter>
                <File
-                       RelativePath="..\..\..\..\packageinfo.sh"
+                       RelativePath="..\..\scripts\mkver.bat"
                        >
                        <FileConfiguration
                                Name="Release|Win32"
+                               ExcludedFromBuild="true"
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
-                                       AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h"
-                                       Outputs="$(ProjectDir)version.c"
                                />
                        </FileConfiguration>
                        <FileConfiguration
                                Name="Debug|Win32"
+                               ExcludedFromBuild="true"
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
-                                       AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h"
-                                       Outputs="$(ProjectDir)version.c"
                                />
                        </FileConfiguration>
                </File>
                <File
-                       RelativePath="..\..\scripts\mkver.bat"
+                       RelativePath="..\..\..\..\packageinfo.sh"
                        >
                        <FileConfiguration
                                Name="Release|Win32"
-                               ExcludedFromBuild="true"
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
+                                       CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
+                                       AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h"
+                                       Outputs="$(ProjectDir)version.c"
                                />
                        </FileConfiguration>
                        <FileConfiguration
                                Name="Debug|Win32"
-                               ExcludedFromBuild="true"
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
+                                       CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
+                                       AdditionalDependencies="..\..\scripts\mkver.bat;..\..\include\config.h"
+                                       Outputs="$(ProjectDir)version.c"
                                />
                        </FileConfiguration>
                </File>
index bc52e61c6afa020d6b8d2c06b9629e477d534c46..659fe388d4308867fda7c6ae0ba8e5fd4d180466 100644 (file)
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,$(OPENSSL_INC)"
+                               AdditionalIncludeDirectories="..\..\ntpdate,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC)"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 87a4d1eecbf5f4d96a853e6d3e9e3afdaa6007d0..02316e27b81cd66ca1dc4ba844fa4042b93f2f06 100644 (file)
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpdc,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 828009ea0a4088b9c3de60a0297815cd9cad69db..45ff42470bb09bb4d33d9bca45932409ce26e716 100644 (file)
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,,$(OPENSSL_INC),..\..\..\..\libopts"
+                               AdditionalIncludeDirectories="..\..\ntpq,..\..\include,..\..\..\..\include,..\..\..\..\lib\isc\win32\include,..\..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\..\libopts"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
index 42eeb7035916a092f360276f075171b45d0e5688..522bc59f07d5d3067d25c9be206dcf1835898d01 100644 (file)
@@ -1,9 +1,15 @@
 # Makefile.am for JMK's SNTP, by Harlan Stenn
 
+NULL=
+
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS= -I ../m4 -I libopts/m4
 
-AM_CPPFLAGS=   $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include
+AM_CPPFLAGS=   $(LIBOPTS_CFLAGS)                       \
+               -I$(top_srcdir)/../include              \
+               -I$(top_srcdir)/../lib/isc/include      \
+               -I$(top_srcdir)/../lib/isc/unix/include \
+               $(NULL)
 LDADD= $(LIBOPTS_LDADD) -lm ../libntp/libntp.a
 
 run_ag=         cd $(srcdir) && autogen -L ../include --writable
@@ -11,8 +17,6 @@ run_ag=         cd $(srcdir) && autogen -L ../include --writable
 bindir=        ${exec_prefix}/${BINSUBDIR}
 bin_PROGRAMS=  sntp
 
-NULL=
-
 SUBDIRS=
 if NEED_LIBOPTS
 SUBDIRS+= libopts
index a5328cf10f6115c8cf836ff3f7d71875f1c651a0..f9fb9fd2943d898fc288d6b62c9b3c527eb9d32f 100644 (file)
@@ -1,3 +1,4 @@
+NULL=
 #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
 AUTOMAKE_OPTIONS=      
 
@@ -6,7 +7,11 @@ bin_PROGRAMS=  @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
 EXTRA_PROGRAMS=        audio-pcm byteorder hist jitter kern longsize \
        ntptime pps-api precision sht testrs6000 tg tickadj timetrim
 
-AM_CPPFLAGS=   -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS=   -I$(top_srcdir)/include                 \
+               -I$(top_srcdir)/lib/isc/include         \
+               -I$(top_srcdir)/lib/isc/unix/include    \
+               $(LIBOPTS_CFLAGS)                       \
+               $(NULL)
 # LDADD might need RESLIB and ADJLIB
 LDADD=         ../libntp/libntp.a
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h