From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 5 Mar 2013 02:03:05 +0000 (-0800)
Subject: Fix a build failure on OpenBSD 4.x.
X-Git-Tag: emacs-24.3-rc1~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=725eb02724597e4eddf2562aac20a3246cdda4ac;p=emacs.git

Fix a build failure on OpenBSD 4.x.

* sysdep.c (KERN_PROC, kinfo_proc) [BSD_SYSTEM && !KERN_PROC]:
Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9.
list-system-processes still returns nil, but at least it doesn't crash.
Problem reported by Nelson H. F. Beebe in
<http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 25a0a100c68..874ea0486d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix a build failure on OpenBSD 4.x.
+	* sysdep.c (KERN_PROC, kinfo_proc) [BSD_SYSTEM && !KERN_PROC]:
+	Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9.
+	list-system-processes still returns nil, but at least it doesn't crash.
+	Problem reported by Nelson H. F. Beebe in
+	<http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
+
 2013-03-02  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren.  (Bug#13734)
diff --git a/src/sysdep.c b/src/sysdep.c
index 47a14bdba35..392771bd121 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2649,6 +2649,13 @@ list_system_processes (void)
 
 #elif defined BSD_SYSTEM
 
+/* OpenBSD 4.9 and earlier do not have KERN_PROC.  Approximate it with
+   KERN_PROC2.  */
+# ifndef KERN_PROC
+#  define KERN_PROC KERN_PROC2
+#  define kinfo_proc kinfo_proc2
+# endif
+
 Lisp_Object
 list_system_processes (void)
 {