2 files changed, 18 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7189f930333..af51c9a100a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to OpenBSD 5.1 amd64.
+        * sysdep.c [BSD_SYSTEM]: Include <sys/param.h> before <sys/sysctl.h>.
+        This is needed for OpenBSD, and should be harmless on all BSD systems.
+        Also, include <sys/sysctl.h>, as it should be available on all
+        BSD_SYSTEM hosts given that we're already calling sysctl in that case.
+        (list_system_processes) [__OpenBSD__]: Use DARWIN_OS style mib, but
+        use p_pid member, not kp_proc.pid.
+
 2012-07-06  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
diff --git a/src/sysdep.c b/src/sysdep.c
index 7a4fa9aa5f7..63bf680f17f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -38,17 +38,17 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sysselect.h"
 #include "blockinput.h"
 
-#ifdef __FreeBSD__
+#ifdef BSD_SYSTEM
+#include <sys/param.h>
 #include <sys/sysctl.h>
+#endif
+
+#ifdef __FreeBSD__
 #include <sys/user.h>
 #include <sys/resource.h>
 #include <math.h>
 #endif
 
-#ifdef DARWIN_OS
-#include <sys/sysctl.h>
-#endif
-
 #ifdef WINDOWSNT
 #define read sys_read
 #define write sys_write
@@ -2520,7 +2520,7 @@ list_system_processes (void)
 Lisp_Object
 list_system_processes (void)
 {
-#ifdef DARWIN_OS
+#if defined DARWIN_OS || defined __OpenBSD__
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
 #else
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
@@ -2548,6 +2548,8 @@ list_system_processes (void)
     {
 #ifdef DARWIN_OS
       proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
+#elif defined __OpenBSD__
+      proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);
 #else
       proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
 #endif