From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 25 Sep 2005 03:18:13 +0000 (-0400)
Subject: [Bug 498] Patches from Miroslaw Pabich
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2ad37d7a8fc059c7ddda06cd3e60bca1f501d5e;p=thirdparty%2Fntp.git

[Bug 498] Patches from Miroslaw Pabich

bk: 433616f5eyaYWx9o6xjoabN6fIzTJA
---

diff --git a/include/adjtime.h b/include/adjtime.h
index b6e2a3e995..74d91eb271 100644
--- 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 81afec7906..19a6e96b74 100644
--- 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 1d27333346..94b660be23 100644
--- 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 6d47eee46b..8bee2925b2 100644
--- 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 7e1ed49658..e63f3da364 100644
--- 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 924a092ee1..3594d52c35 100644
--- 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"