Many files:

  * include/ntp_machine.h (HAVE_TERMIOS): STREAMS does not imply
  HAVE_TERMIOS !!!
  * include/parse.h (timercmp): Macro defined if needed.
  * ntpd/ntp_config.c (SIGCHLD): Macro defined as SIGCLD if needed.
  (sys/wait.h): File included only if HAVE_SYS_WAIT_H.
  * configure.in (sys/wait.h): File added to AC_CHECK_HEADERS list.
  From: Philippe De Muyter  <phdm@macqel.be>

bk: 3782fd18CK10frHA9oq_DNzgODF-7A

diff --git a/ChangeLog b/ChangeLog
index 55eb12a29db287802f1ae2eeaf7a0bbc945ea1de..696abc48c8d47fc422b5377d6231df6e42b279cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-07-07  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * include/ntp_machine.h (HAVE_TERMIOS): STREAMS does not imply
+       HAVE_TERMIOS !!!
+       * include/parse.h (timercmp): Macro defined if needed.
+       * ntpd/ntp_config.c (SIGCHLD): Macro defined as SIGCLD if needed.
+       (sys/wait.h): File included only if HAVE_SYS_WAIT_H.
+       * configure.in (sys/wait.h): File added to AC_CHECK_HEADERS list.
+       From: Philippe De Muyter  <phdm@macqel.be>
+
 1999-06-23  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * ntpd/refclock_irig.c (irig_debug): NetBSD patches

diff --git a/config.h.in b/config.h.in
index c7605377eeff82b01705faa0f1f292e78bc42d7a..4e4ea5a83c7b0d42e77f211ae45ce5e2075da0c2 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -780,6 +780,9 @@
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
+
 /* Define if you have the <termio.h> header file.  */
 #undef HAVE_TERMIO_H
 

diff --git a/configure b/configure
index 30f997417ff1d5cb4f9bc51d40c57b8247f075f5..b52664734de09c1a71af880ee2589a248cf39432 100755 (executable)
--- a/configure
+++ b/configure
@@ -2520,7 +2520,7 @@ else
 fi
 done
 
-for ac_hdr in stdlib.h string.h termio.h termios.h timepps.h
+for ac_hdr in stdlib.h string.h sys/wait.h termio.h termios.h timepps.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 396dd79d26b0ec766f8efe54806934bd37ce1846..c986f8646003b0282bd708b5ae1d4fc8b916bdc6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -203,7 +203,7 @@ esac
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS(bstring.h errno.h fcntl.h memory.h poll.h sched.h sgtty.h)
-AC_CHECK_HEADERS(stdlib.h string.h termio.h termios.h timepps.h)
+AC_CHECK_HEADERS(stdlib.h string.h sys/wait.h termio.h termios.h timepps.h)
 AC_CHECK_HEADERS(timex.h unistd.h utmp.h utmpx.h)
 AC_CHECK_HEADERS(arpa/nameser.h net/if.h netinet/in.h netinet/ip.h resolv.h)
 AC_CHECK_HEADERS(sun/audioio.h sys/audioio.h)

diff --git a/include/ntp_machine.h b/include/ntp_machine.h
index 5d3275657a8468e1f3c7463b958abb5f648ae77e..f0b8ff1a63f8ed6769449040aac2baa3acf0903f 100644 (file)
--- a/include/ntp_machine.h
+++ b/include/ntp_machine.h
@@ -442,12 +442,6 @@ struct servent *getservbyname P((char *name, char *type));
 # endif
 #endif
 
-#ifdef STREAM                  /* STREAM implies TERMIOS */
-# ifndef HAVE_TERMIOS
-#  define HAVE_TERMIOS
-# endif
-#endif
-
 #ifndef RETSIGTYPE
 # if defined(NTP_POSIX_SOURCE)
 #  define      RETSIGTYPE      void

diff --git a/include/parse.h b/include/parse.h
index 022371fd4973e7e63302c885feb4ac54745073b3..56a92e95d15ac39eef1f3b3ee4f2f84129f51a88 100644 (file)
--- a/include/parse.h
+++ b/include/parse.h
@@ -72,6 +72,9 @@ extern unsigned int splclock P((void));
 
 #if defined(timercmp) && defined(__GNUC__)
 #undef timercmp
+#endif
+
+#if !defined(timercmp)
 #define        timercmp(tvp, uvp, cmp) \
        ((tvp)->tv_sec cmp (uvp)->tv_sec || \
         ((tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec))

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index f942efb84294d130398dc7507a55586a215d2cb6..22f9450b0b973b957f80319df338784b5d1d27a0 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -6,8 +6,13 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <signal.h>
+#ifndef SIGCHLD
+#define SIGCHLD SIGCLD
+#endif
 #if !defined(VMS)
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 #endif /* VMS */
 #include <sys/time.h>