Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org

2 files changed, 18 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b511550624f..23071b03bee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a build failure on OpenBSD 4.x and MirBSD.
+        * sysdep.c (KERN_PROC, kinfo_proc)
+        [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]:
+        Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD.
+        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-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * composite.c (get_composition_id, fill_gstring_header):
diff --git a/src/sysdep.c b/src/sysdep.c
index 606a5b038ca..c4b937183ca 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2543,6 +2543,14 @@ list_system_processes (void)
 
 #elif defined BSD_SYSTEM
 
+/* OpenBSD 4.9 and earlier do not have KERN_PROC.  Approximate it with
+   KERN_PROC2.  MirBSD's KERN_PROC seems to be busted.  */
+# if !defined KERN_PROC || defined __MirBSD__
+#  undef KERN_PROC
+#  define KERN_PROC KERN_PROC2
+#  define kinfo_proc kinfo_proc2
+# endif
+
 Lisp_Object
 list_system_processes (void)
 {