[Bug 498] Patches from Miroslaw Pabich

bk: 433616f5eyaYWx9o6xjoabN6fIzTJA

diff --git a/include/adjtime.h b/include/adjtime.h
index b6e2a3e9954117a7e3a7ae5071f27e8d4ded79f4..74d91eb2719d48113e491b3edd9630d284786617 100644 (file)
--- a/include/adjtime.h
+++ b/include/adjtime.h
@@ -39,10 +39,6 @@
 
 #include "ntp_types.h"
 
-#ifdef __QNXNTO__
-int adjtime( const struct timeval * oldtime, struct timeval * newtime );
-#else /* not __QNXNTO__ */
-
 #define KEY    659847L
 
 typedef union {
@@ -65,5 +61,3 @@ typedef union {
  */
 #define DELTA1 0
 #define DELTA2 1
-
-#endif /* not __QNXNTO__ */

diff --git a/libntp/iosignal.c b/libntp/iosignal.c
index 81afec79062cd75fcbd0f210cee17ea6ce3e8989..19a6e96b7401cbc73f8861887558c9f522c78fc0 100644 (file)
--- a/libntp/iosignal.c
+++ b/libntp/iosignal.c
@@ -31,6 +31,12 @@
 # include <ifaddrs.h>
 #endif
 
+# ifdef __QNXNTO__
+#  include <fcntl.h>
+#  include <unix.h>
+#  define FNDELAY O_NDELAY
+# endif
+
 #include "ntp_machine.h"
 #include "ntpd.h"
 #include "ntp_io.h"
@@ -81,12 +87,6 @@ extern       void    input_handler   P((l_fp *));
 #  define USE_SIGIO
 # endif
 
-# ifdef __QNXNTO__
-#  include <fcntl.h>
-#  include <unix.h>
-#  define FNDELAY O_NDELAY
-# endif
-
 # if defined(USE_SIGIO) && defined(USE_SIGPOLL)
 #  if SIGIO == SIGPOLL
 #      define USE_SIGIO

diff --git a/ntpd/refclock_hopfser.c b/ntpd/refclock_hopfser.c
index 1d273333465db89c9b208f0d014257358732c540..94b660be236e6b3db772215fef6c76c112b9cd1f 100644 (file)
--- a/ntpd/refclock_hopfser.c
+++ b/ntpd/refclock_hopfser.c
@@ -30,9 +30,11 @@
 
 #if defined HAVE_SYS_MODEM_H
 # include <sys/modem.h>
-# define TIOCMSET MCSETA
-# define TIOCMGET MCGETA
-# define TIOCM_RTS MRTS
+# ifndef __QNXNTO__
+#  define TIOCMSET MCSETA
+#  define TIOCMGET MCGETA
+#  define TIOCM_RTS MRTS
+# endif
 #endif
 
 #ifdef HAVE_TERMIOS_H

diff --git a/ntpd/refclock_neoclock4x.c b/ntpd/refclock_neoclock4x.c
index 6d47eee46b3d19fcb6b8cffc1a258f9d74f1e23b..8bee2925b29b76f9cf0a6c2bf01027bddd2cc235 100644 (file)
--- a/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@ -39,9 +39,11 @@
 
 #if defined HAVE_SYS_MODEM_H
 # include <sys/modem.h>
-# define TIOCMSET MCSETA
-# define TIOCMGET MCGETA
-# define TIOCM_RTS MRTS
+# ifndef __QNXNTO__
+#  define TIOCMSET MCSETA
+#  define TIOCMGET MCGETA
+#  define TIOCM_RTS MRTS
+# endif
 #endif
 
 #ifdef HAVE_TERMIOS_H

diff --git a/ntpd/refclock_palisade.h b/ntpd/refclock_palisade.h
index 7e1ed49658de66b852c1b50af45c567aa811e5f8..e63f3da364527bb3e745a0e57091578134cb51d9 100644 (file)
--- a/ntpd/refclock_palisade.h
+++ b/ntpd/refclock_palisade.h
@@ -59,10 +59,12 @@
 
 #if defined HAVE_SYS_MODEM_H
 #include <sys/modem.h>
+#ifndef __QNXNTO__
 #define TIOCMSET MCSETA
 #define TIOCMGET MCGETA
 #define TIOCM_RTS MRTS
 #endif
+#endif
 
 #ifdef HAVE_TERMIOS_H
 # ifdef TERMIOS_NEEDS__SVID3

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 924a092ee1e352478ef41629ab0ceee4d2791267..3594d52c35c85e9a1a581717d7f5141cbc329722 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -47,10 +47,6 @@
 
 #include <arpa/inet.h>
 
-#ifdef __QNXNTO__
-# include "adjtime.h"
-#endif
-
 #ifdef SYS_VXWORKS
 # include "ioLib.h"
 # include "sockLib.h"