diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-12 22:04:46 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-12 22:04:46 -0700 |
| commit | 7fd8c501a0de9e2f52a3ba6989646e3aa391649f (patch) | |
| tree | f1e0438ed3392a7fe7be99ca088255bfd58952dc | |
| parent | e7f7cb1aa3beb791d3175e30f1b5e40985cba413 (diff) | |
| download | emacs-7fd8c501a0de9e2f52a3ba6989646e3aa391649f.tar.gz | |
* sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.
Include <sys/param.h> unconditionally, as that works elsewhere and
is simpler here. Include <sys/sysctl.h> if DARWIN_OS ||
__FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin
and FreeBSD now.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/sysdep.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8ae25e6e612..c0e6bd93fd0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-03-13 Paul Eggert <eggert@cs.ucla.edu> + + * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out. + Include <sys/param.h> unconditionally, as that works elsewhere and + is simpler here. Include <sys/sysctl.h> if DARWIN_OS || + __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin + and FreeBSD now. + 2013-03-11 Paul Eggert <eggert@cs.ucla.edu> * insdel.c (adjust_after_replace): Use bool for boolean. diff --git a/src/sysdep.c b/src/sysdep.c index fe6371623a9..b99f179210c 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -38,9 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "sysselect.h" #include "blockinput.h" -#ifdef BSD_SYSTEM -#include <sys/param.h> -#include <sys/sysctl.h> +#if defined DARWIN_OS || defined __FreeBSD__ +# include <sys/sysctl.h> #endif #ifdef __FreeBSD__ @@ -69,9 +68,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida, MW Aug 1993 */ #include "msdos.h" -#include <sys/param.h> #endif +#include <sys/param.h> #include <sys/file.h> #include <fcntl.h> |