[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111317: Also port to MirBSD.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111317: Also port to MirBSD. |
Date: |
Mon, 04 Mar 2013 18:15:35 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111317
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Mon 2013-03-04 18:15:35 -0800
message:
Also port to MirBSD.
modified:
src/ChangeLog
src/sysdep.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-05 02:03:05 +0000
+++ b/src/ChangeLog 2013-03-05 02:15:35 +0000
@@ -1,8 +1,9 @@
2013-03-05 Paul Eggert <address@hidden>
- 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.
+ 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>.
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2013-03-05 02:03:05 +0000
+++ b/src/sysdep.c 2013-03-05 02:15:35 +0000
@@ -2650,8 +2650,9 @@
#elif defined BSD_SYSTEM
/* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with
- KERN_PROC2. */
-# ifndef KERN_PROC
+ 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111317: Also port to MirBSD.,
Paul Eggert <=