[Bug 1223] reorganize inclusion of sys/resource.h

bk: 50e93f2787seWe_mBB-9MBA3iP9paA

diff --git a/ChangeLog b/ChangeLog
index 5a1037b65a16295a4e977b818107d1d6dbd7c13b..27ecba7405fe3428752df117eb88abb850430b23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1223] reorganize inclusion of sys/resource.h.
 (4.2.7p345) 2013/01/04 Released by Harlan Stenn <stenn@ntp.org>
 * Update several .def files to use autogen-5.17 feature set.
 (4.2.7p344) 2013/01/03 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/include/ntp_config.h b/include/ntp_config.h
index 8af4cd340b3d3dd7a96229fb422fa50b7655f83c..9c2f055856e01050580cc4909483ab67bb3e22c9 100644 (file)
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -1,6 +1,10 @@
 #ifndef NTP_CONFIG_H
 #define NTP_CONFIG_H
 
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif /* HAVE_SYS_RESOURCE_H */
+
 #include "ntp_machine.h"
 #include "ntpsim.h"
 

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 659f275205210b8d78ea0c8e952a659a196b876d..e9098fdc8201d717f6e0616e3b97bb55c6f9130a 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -26,9 +26,6 @@
 #ifndef SIGCHLD
 # define SIGCHLD SIGCLD
 #endif
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif

diff --git a/ntpd/ntp_util.c b/ntpd/ntp_util.c
index 0b15dbb5967386f5f7a386c17337af1de07fe019..83040aeef59e14b0111a5fe439e7d5351e58810d 100644 (file)
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -31,12 +31,6 @@
 # include <math.h>
 #endif
 
-#ifdef DOSYNCTODR
-# if !defined(VMS)
-#  include <sys/resource.h>
-# endif /* VMS */
-#endif
-
 #if defined(VMS)
 # include <descrip.h>
 #endif /* VMS */

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index ef4b8493d8e15797f97d323e1ee59acf23688ac2..625e7a6452444626a48fad11ecb578e1aeb18faf 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -44,9 +44,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif /* HAVE_SYS_IOCTL_H */
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
 #if defined(HAVE_RTPRIO)
 # ifdef HAVE_SYS_LOCK_H
 #  include <sys/lock.h>