[ntpsec commit] Neither Linux nor FreeBSD build requires nonstandard sys/ params.h. Rip it out.

Eric S. Raymond esr at ntpsec.org
Tue Oct 20 06:11:46 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    6b2d09fe799a3a5760f365847a1c45f954d664b9
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=6b2d09fe799a3a5760f365847a1c45f954d664b9

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Tue Oct 20 02:09:37 2015 -0400

Neither Linux nor FreeBSD build requires nonstandard sys/params.h.  Rip it out.

A comment hints that it was required on OpenBSD in 2010.  We'll cross that
bridge when we get to it.

---

 lib/isc/unix/net.c  | 3 ---
 libntp/iosignal.c   | 4 ----
 libntp/ntp_intres.c | 6 ------
 libntp/systime.c    | 3 ---
 ntpd/check_y2k.c    | 1 -
 ntpd/ntp_config.c   | 3 ---
 ntpd/ntp_crypto.c   | 1 -
 ntpd/ntp_io.c       | 3 ---
 ntpd/ntpd.c         | 3 ---
 pylib/configure.py  | 1 -
 10 files changed, 28 deletions(-)

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 3e04f9b..24115c5 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -10,9 +10,6 @@
 #include <sys/types.h>
 
 #if defined(HAVE_SYS_SYSCTL_H)
-#if defined(HAVE_SYS_PARAM_H)
-#include <sys/param.h>
-#endif
 #include <sys/sysctl.h>
 #endif
 
diff --git a/libntp/iosignal.c b/libntp/iosignal.c
index 0da2d8b..7ba8951 100644
--- a/libntp/iosignal.c
+++ b/libntp/iosignal.c
@@ -4,10 +4,6 @@
  */
 
 /*
- * [Bug 158]
- * Do the #includes differently, as under some versions of Linux
- * sys/param.h has a #undef CONFIG_PHONE line in it.
- *
  * As we have ~40 CONFIG_ variables, I don't feel like renaming them
  * every time somebody adds a new macro to some system header.
  */
diff --git a/libntp/ntp_intres.c b/libntp/ntp_intres.c
index 4afef4e..91a2aac 100644
--- a/libntp/ntp_intres.c
+++ b/libntp/ntp_intres.c
@@ -56,15 +56,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
-
-/**/
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-/**/
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 
 #if defined(HAVE_RESOLV_H) && defined(HAVE_RES_INIT)
 # ifdef HAVE_ARPA_NAMESER_H
diff --git a/libntp/systime.c b/libntp/systime.c
index f8703f4..3b23e46 100644
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -15,9 +15,6 @@
 #include "timespecops.h"
 #include "ntp_calendar.h"
 
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 #include <utmpx.h>
 
 
diff --git a/ntpd/check_y2k.c b/ntpd/check_y2k.c
index f98099b..91d24f5 100644
--- a/ntpd/check_y2k.c
+++ b/ntpd/check_y2k.c
@@ -38,7 +38,6 @@
 #include <signal.h>
 
 #ifndef SYS_WINNT
-# include <sys/param.h>
 # ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 # endif /* HAVE_SYS_IOCTL_H */
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index cf1cfd2..95a1f13 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -19,9 +19,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 #include <signal.h>
 #include <sys/wait.h>
 
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 0b31ee9..998a6de 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>	/* strtoul */
 #include <sys/types.h>
-#include <sys/param.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 00a362e..aadb548 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -11,9 +11,6 @@
 #if !defined(FNM_CASEFOLD) && defined(FNM_IGNORECASE)
 # define FNM_CASEFOLD FNM_IGNORECASE
 #endif
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 44e6383..9354cb4 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -26,9 +26,6 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdbool.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
 #include <signal.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
diff --git a/pylib/configure.py b/pylib/configure.py
index 368bbbf..5f2353b 100644
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -255,7 +255,6 @@ def cmd_configure(ctx):
 		"sys/audioio.h",
 		"sys/ioctl.h",
 		"sys/modem.h",
-		"sys/param.h",
 		"sys/prctl.h",
 		"sys/ppsclock.h",
 		"sys/procset.h",



More information about the vc mailing list