From: Dave Hart Date: Thu, 24 Sep 2009 07:27:15 +0000 (+0000) Subject: Reorganize our copy of libisc code to match BIND 9 tarball layout, preparing X-Git-Tag: NTP_4_2_5P220~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7dc11c11c656bbbbe664f016b029a7756c06d9d;p=thirdparty%2Fntp.git Reorganize our copy of libisc code to match BIND 9 tarball layout, preparing 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 --- diff --git a/Makefile.am b/Makefile.am index 0a7c9237c..15da7c03f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 562efac8a..6eae7bab7 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/include/Makefile.am b/include/Makefile.am index 675788865..26ae9c6a6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -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 \ diff --git a/libisc/assertions.c b/lib/isc/assertions.c similarity index 100% rename from libisc/assertions.c rename to lib/isc/assertions.c diff --git a/libisc/error.c b/lib/isc/error.c similarity index 100% rename from libisc/error.c rename to lib/isc/error.c diff --git a/include/isc/Makefile.am b/lib/isc/include/isc/Makefile.am similarity index 86% rename from include/isc/Makefile.am rename to lib/isc/include/isc/Makefile.am index 9d3474f3d..12be59177 100644 --- a/include/isc/Makefile.am +++ b/lib/isc/include/isc/Makefile.am @@ -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) diff --git a/include/isc/app.h b/lib/isc/include/isc/app.h similarity index 100% rename from include/isc/app.h rename to lib/isc/include/isc/app.h diff --git a/include/isc/assertions.h b/lib/isc/include/isc/assertions.h similarity index 100% rename from include/isc/assertions.h rename to lib/isc/include/isc/assertions.h diff --git a/include/isc/boolean.h b/lib/isc/include/isc/boolean.h similarity index 100% rename from include/isc/boolean.h rename to lib/isc/include/isc/boolean.h diff --git a/include/isc/buffer.h b/lib/isc/include/isc/buffer.h similarity index 100% rename from include/isc/buffer.h rename to lib/isc/include/isc/buffer.h diff --git a/include/isc/error.h b/lib/isc/include/isc/error.h similarity index 100% rename from include/isc/error.h rename to lib/isc/include/isc/error.h diff --git a/include/isc/file.h b/lib/isc/include/isc/file.h similarity index 100% rename from include/isc/file.h rename to lib/isc/include/isc/file.h diff --git a/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h similarity index 100% rename from include/isc/formatcheck.h rename to lib/isc/include/isc/formatcheck.h diff --git a/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h similarity index 100% rename from include/isc/interfaceiter.h rename to lib/isc/include/isc/interfaceiter.h diff --git a/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h similarity index 100% rename from include/isc/ipv6.h rename to lib/isc/include/isc/ipv6.h diff --git a/include/isc/lang.h b/lib/isc/include/isc/lang.h similarity index 100% rename from include/isc/lang.h rename to lib/isc/include/isc/lang.h diff --git a/include/isc/lib.h b/lib/isc/include/isc/lib.h similarity index 100% rename from include/isc/lib.h rename to lib/isc/include/isc/lib.h diff --git a/include/isc/list.h b/lib/isc/include/isc/list.h similarity index 100% rename from include/isc/list.h rename to lib/isc/include/isc/list.h diff --git a/include/isc/log.h b/lib/isc/include/isc/log.h similarity index 100% rename from include/isc/log.h rename to lib/isc/include/isc/log.h diff --git a/include/isc/magic.h b/lib/isc/include/isc/magic.h similarity index 100% rename from include/isc/magic.h rename to lib/isc/include/isc/magic.h diff --git a/include/isc/md5.h b/lib/isc/include/isc/md5.h similarity index 100% rename from include/isc/md5.h rename to lib/isc/include/isc/md5.h diff --git a/include/isc/mem.h b/lib/isc/include/isc/mem.h similarity index 100% rename from include/isc/mem.h rename to lib/isc/include/isc/mem.h diff --git a/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h similarity index 100% rename from include/isc/msgcat.h rename to lib/isc/include/isc/msgcat.h diff --git a/include/isc/msgs.h b/lib/isc/include/isc/msgs.h similarity index 100% rename from include/isc/msgs.h rename to lib/isc/include/isc/msgs.h diff --git a/include/isc/mutex.h b/lib/isc/include/isc/mutex.h similarity index 100% rename from include/isc/mutex.h rename to lib/isc/include/isc/mutex.h diff --git a/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h similarity index 100% rename from include/isc/netaddr.h rename to lib/isc/include/isc/netaddr.h diff --git a/include/isc/netscope.h b/lib/isc/include/isc/netscope.h similarity index 100% rename from include/isc/netscope.h rename to lib/isc/include/isc/netscope.h diff --git a/include/isc/once.h b/lib/isc/include/isc/once.h similarity index 100% rename from include/isc/once.h rename to lib/isc/include/isc/once.h diff --git a/include/isc/platform.h b/lib/isc/include/isc/platform.h similarity index 100% rename from include/isc/platform.h rename to lib/isc/include/isc/platform.h diff --git a/include/isc/print.h b/lib/isc/include/isc/print.h similarity index 100% rename from include/isc/print.h rename to lib/isc/include/isc/print.h diff --git a/include/isc/region.h b/lib/isc/include/isc/region.h similarity index 100% rename from include/isc/region.h rename to lib/isc/include/isc/region.h diff --git a/include/isc/result.h b/lib/isc/include/isc/result.h similarity index 100% rename from include/isc/result.h rename to lib/isc/include/isc/result.h diff --git a/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h similarity index 100% rename from include/isc/sockaddr.h rename to lib/isc/include/isc/sockaddr.h diff --git a/include/isc/stdio.h b/lib/isc/include/isc/stdio.h similarity index 100% rename from include/isc/stdio.h rename to lib/isc/include/isc/stdio.h diff --git a/include/isc/string.h b/lib/isc/include/isc/string.h similarity index 100% rename from include/isc/string.h rename to lib/isc/include/isc/string.h diff --git a/include/isc/types.h b/lib/isc/include/isc/types.h similarity index 100% rename from include/isc/types.h rename to lib/isc/include/isc/types.h diff --git a/include/isc/util.h b/lib/isc/include/isc/util.h similarity index 100% rename from include/isc/util.h rename to lib/isc/include/isc/util.h diff --git a/libisc/inet_aton.c b/lib/isc/inet_aton.c similarity index 100% rename from libisc/inet_aton.c rename to lib/isc/inet_aton.c diff --git a/libisc/inet_ntop.c b/lib/isc/inet_ntop.c similarity index 100% rename from libisc/inet_ntop.c rename to lib/isc/inet_ntop.c diff --git a/libisc/inet_pton.c b/lib/isc/inet_pton.c similarity index 100% rename from libisc/inet_pton.c rename to lib/isc/inet_pton.c diff --git a/libisc/lib.c b/lib/isc/lib.c similarity index 100% rename from libisc/lib.c rename to lib/isc/lib.c diff --git a/libisc/log.c b/lib/isc/log.c similarity index 100% rename from libisc/log.c rename to lib/isc/log.c diff --git a/libisc/md5.c b/lib/isc/md5.c similarity index 100% rename from libisc/md5.c rename to lib/isc/md5.c diff --git a/libisc/mem.c b/lib/isc/mem.c similarity index 100% rename from libisc/mem.c rename to lib/isc/mem.c diff --git a/libisc/netaddr.c b/lib/isc/netaddr.c similarity index 100% rename from libisc/netaddr.c rename to lib/isc/netaddr.c diff --git a/libisc/netscope.c b/lib/isc/netscope.c similarity index 100% rename from libisc/netscope.c rename to lib/isc/netscope.c diff --git a/libisc/msgcat.c b/lib/isc/nls/msgcat.c similarity index 100% rename from libisc/msgcat.c rename to lib/isc/nls/msgcat.c diff --git a/libisc/sockaddr.c b/lib/isc/sockaddr.c similarity index 100% rename from libisc/sockaddr.c rename to lib/isc/sockaddr.c diff --git a/libisc/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c similarity index 100% rename from libisc/ifiter_getifaddrs.c rename to lib/isc/unix/ifiter_getifaddrs.c diff --git a/libisc/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c similarity index 100% rename from libisc/ifiter_ioctl.c rename to lib/isc/unix/ifiter_ioctl.c diff --git a/libisc/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c similarity index 100% rename from libisc/ifiter_sysctl.c rename to lib/isc/unix/ifiter_sysctl.c diff --git a/lib/isc/unix/include/isc/Makefile.am b/lib/isc/unix/include/isc/Makefile.am new file mode 100644 index 000000000..7f2f2cd54 --- /dev/null +++ b/lib/isc/unix/include/isc/Makefile.am @@ -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) diff --git a/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h similarity index 100% rename from include/isc/dir.h rename to lib/isc/unix/include/isc/dir.h diff --git a/include/isc/int.h b/lib/isc/unix/include/isc/int.h similarity index 100% rename from include/isc/int.h rename to lib/isc/unix/include/isc/int.h diff --git a/include/isc/net.h b/lib/isc/unix/include/isc/net.h similarity index 100% rename from include/isc/net.h rename to lib/isc/unix/include/isc/net.h diff --git a/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h similarity index 100% rename from include/isc/offset.h rename to lib/isc/unix/include/isc/offset.h diff --git a/include/isc/stat.h b/lib/isc/unix/include/isc/stat.h similarity index 100% rename from include/isc/stat.h rename to lib/isc/unix/include/isc/stat.h diff --git a/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h similarity index 100% rename from include/isc/strerror.h rename to lib/isc/unix/include/isc/strerror.h diff --git a/include/isc/time.h b/lib/isc/unix/include/isc/time.h similarity index 100% rename from include/isc/time.h rename to lib/isc/unix/include/isc/time.h diff --git a/libisc/interfaceiter.c b/lib/isc/unix/interfaceiter.c similarity index 100% rename from libisc/interfaceiter.c rename to lib/isc/unix/interfaceiter.c diff --git a/libisc/net.c b/lib/isc/unix/net.c similarity index 100% rename from libisc/net.c rename to lib/isc/unix/net.c diff --git a/libisc/isc_strerror.c b/lib/isc/unix/strerror.c similarity index 100% rename from libisc/isc_strerror.c rename to lib/isc/unix/strerror.c diff --git a/ports/winnt/include/isc/int.h b/lib/isc/win32/include/isc/int.h similarity index 100% rename from ports/winnt/include/isc/int.h rename to lib/isc/win32/include/isc/int.h diff --git a/ports/winnt/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h similarity index 100% rename from ports/winnt/include/isc/ipv6.h rename to lib/isc/win32/include/isc/ipv6.h diff --git a/ports/winnt/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h similarity index 100% rename from ports/winnt/include/isc/mutex.h rename to lib/isc/win32/include/isc/mutex.h diff --git a/ports/winnt/include/isc/net.h b/lib/isc/win32/include/isc/net.h similarity index 100% rename from ports/winnt/include/isc/net.h rename to lib/isc/win32/include/isc/net.h diff --git a/ports/winnt/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h similarity index 100% rename from ports/winnt/include/isc/offset.h rename to lib/isc/win32/include/isc/offset.h diff --git a/ports/winnt/include/isc/once.h b/lib/isc/win32/include/isc/once.h similarity index 100% rename from ports/winnt/include/isc/once.h rename to lib/isc/win32/include/isc/once.h diff --git a/ports/winnt/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h similarity index 100% rename from ports/winnt/include/isc/platform.h rename to lib/isc/win32/include/isc/platform.h diff --git a/ports/winnt/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h similarity index 100% rename from ports/winnt/include/isc/stat.h rename to lib/isc/win32/include/isc/stat.h diff --git a/ports/winnt/include/isc/strerror.h b/lib/isc/win32/include/isc/strerror.h similarity index 100% rename from ports/winnt/include/isc/strerror.h rename to lib/isc/win32/include/isc/strerror.h diff --git a/ports/winnt/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h similarity index 100% rename from ports/winnt/include/isc/win32os.h rename to lib/isc/win32/include/isc/win32os.h diff --git a/ports/winnt/libisc/interfaceiter.c b/lib/isc/win32/interfaceiter.c similarity index 100% rename from ports/winnt/libisc/interfaceiter.c rename to lib/isc/win32/interfaceiter.c diff --git a/ports/winnt/libisc/net.c b/lib/isc/win32/net.c similarity index 100% rename from ports/winnt/libisc/net.c rename to lib/isc/win32/net.c diff --git a/ports/winnt/libisc/once.c b/lib/isc/win32/once.c similarity index 100% rename from ports/winnt/libisc/once.c rename to lib/isc/win32/once.c diff --git a/ports/winnt/libisc/isc_strerror.c b/lib/isc/win32/strerror.c similarity index 100% rename from ports/winnt/libisc/isc_strerror.c rename to lib/isc/win32/strerror.c diff --git a/ports/winnt/libisc/win32os.c b/lib/isc/win32/win32os.c similarity index 100% rename from ports/winnt/libisc/win32os.c rename to lib/isc/win32/win32os.c diff --git a/libisc/strerror.c b/libisc/strerror.c deleted file mode 100644 index 4a0f8d80c..000000000 --- a/libisc/strerror.c +++ /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 - -#include -#include - -#include -#include -#include -#include -#include - -#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 -} diff --git a/libntp/Makefile.am b/libntp/Makefile.am index a7d78a408..f13aad00f 100644 --- a/libntp/Makefile.am +++ b/libntp/Makefile.am @@ -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 diff --git a/libntp/strerror.c b/libntp/bsd_strerror.c similarity index 100% rename from libntp/strerror.c rename to libntp/bsd_strerror.c diff --git a/libparse/Makefile.am b/libparse/Makefile.am index 4143b58f2..b0d5ebf33 100644 --- a/libparse/Makefile.am +++ b/libparse/Makefile.am @@ -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 diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am index 4f408cc15..d8a0268b5 100644 --- a/ntpd/Makefile.am +++ b/ntpd/Makefile.am @@ -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 diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am index b58048ea5..ffe2f430d 100644 --- a/ntpdate/Makefile.am +++ b/ntpdate/Makefile.am @@ -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 diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am index 68d9bb600..6c908a2bb 100644 --- a/ntpdc/Makefile.am +++ b/ntpdc/Makefile.am @@ -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 diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am index 6fd5ab113..ec6e2522f 100644 --- a/ntpq/Makefile.am +++ b/ntpq/Makefile.am @@ -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 diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am index 82cb4bc94..4843c6773 100644 --- a/ntpsnmpd/Makefile.am +++ b/ntpsnmpd/Makefile.am @@ -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 diff --git a/parseutil/Makefile.am b/parseutil/Makefile.am index 0e6aaf022..ff70f4fb8 100644 --- a/parseutil/Makefile.am +++ b/parseutil/Makefile.am @@ -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 index a69b70269..000000000 --- a/ports/winnt/libntp/interfaceiter.c +++ /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 -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -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; -} diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp index 9dca3dd88..0eeeac6be 100644 --- a/ports/winnt/vc6/libntp.dsp +++ b/ports/winnt/vc6/libntp.dsp @@ -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 diff --git a/ports/winnt/vc6/ntpd.dsp b/ports/winnt/vc6/ntpd.dsp index a18e59735..e21666934 100644 --- a/ports/winnt/vc6/ntpd.dsp +++ b/ports/winnt/vc6/ntpd.dsp @@ -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" diff --git a/ports/winnt/vc6/ntpdate.dsp b/ports/winnt/vc6/ntpdate.dsp index 98e0df736..71ba703fd 100644 --- a/ports/winnt/vc6/ntpdate.dsp +++ b/ports/winnt/vc6/ntpdate.dsp @@ -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 diff --git a/ports/winnt/vc6/ntpdc.dsp b/ports/winnt/vc6/ntpdc.dsp index 39c173b8d..b918a55a1 100644 --- a/ports/winnt/vc6/ntpdc.dsp +++ b/ports/winnt/vc6/ntpdc.dsp @@ -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 diff --git a/ports/winnt/vc6/ntpkeygen.dsp b/ports/winnt/vc6/ntpkeygen.dsp index d45e646bb..026744eb3 100644 --- a/ports/winnt/vc6/ntpkeygen.dsp +++ b/ports/winnt/vc6/ntpkeygen.dsp @@ -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 diff --git a/ports/winnt/vc6/ntpq.dsp b/ports/winnt/vc6/ntpq.dsp index eaea563f8..fa24226ce 100644 --- a/ports/winnt/vc6/ntpq.dsp +++ b/ports/winnt/vc6/ntpq.dsp @@ -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 diff --git a/ports/winnt/vs2003/libntp.vcproj b/ports/winnt/vs2003/libntp.vcproj index 0d1c3d034..5d374d2db 100644 --- a/ports/winnt/vs2003/libntp.vcproj +++ b/ports/winnt/vs2003/libntp.vcproj @@ -21,7 +21,7 @@ + RelativePath="..\..\..\lib\isc\assertions.c"> + RelativePath="..\..\..\lib\isc\error.c"> + RelativePath="..\..\..\lib\isc\inet_aton.c"> + RelativePath="..\..\..\lib\isc\inet_ntop.c"> + RelativePath="..\..\..\lib\isc\inet_pton.c"> + RelativePath="..\..\..\lib\isc\win32\interfaceiter.c"> + RelativePath="..\..\..\lib\isc\win32\strerror.c"> + RelativePath="..\..\..\lib\isc\lib.c"> + RelativePath="..\..\..\lib\isc\md5.c"> + RelativePath="..\..\..\lib\isc\nls\msgcat.c"> + RelativePath="..\..\..\lib\isc\win32\net.c"> + RelativePath="..\..\..\lib\isc\netaddr.c"> + RelativePath="..\..\..\lib\isc\netscope.c"> + RelativePath="..\..\..\lib\isc\win32\once.c"> + RelativePath="..\..\..\lib\isc\sockaddr.c"> + RelativePath="..\..\..\lib\isc\win32\win32os.c"> - - - - - - diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj index bc52e61c6..659fe388d 100644 --- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj +++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj @@ -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" @@ -145,7 +145,7 @@ 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" diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj index 87a4d1eec..02316e27b 100644 --- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj +++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj @@ -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" @@ -144,7 +144,7 @@ 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" diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj index 828009ea0..45ff42470 100644 --- a/ports/winnt/vs2008/ntpq/ntpq.vcproj +++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj @@ -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" @@ -143,7 +143,7 @@ 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" diff --git a/sntp/Makefile.am b/sntp/Makefile.am index 42eeb7035..522bc59f0 100644 --- a/sntp/Makefile.am +++ b/sntp/Makefile.am @@ -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 diff --git a/util/Makefile.am b/util/Makefile.am index a5328cf10..f9fb9fd29 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -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