[Emacs-diffs] /srv/bzr/emacs/trunk r112030: * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.

[Paul Eggert]

------------------------------------------------------------
revno: 112030
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-12 22:04:46 -0700
message:
  * 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.
modified:
  src/ChangeLog
  src/sysdep.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-11 16:31:55 +0000
+++ b/src/ChangeLog     2013-03-13 05:04:46 +0000
@@ -1,3 +1,11 @@
+2013-03-13  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * insdel.c (adjust_after_replace): Use bool for boolean.

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2013-03-06 08:01:47 +0000
+++ b/src/sysdep.c      2013-03-13 05:04:46 +0000
@@ -38,9 +38,8 @@
 #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 @@
 
 #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>