aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/sysdep.c8
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 @@
12013-03-05 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix a build failure on OpenBSD 4.x and MirBSD.
4 * sysdep.c (KERN_PROC, kinfo_proc)
5 [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]:
6 Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD.
7 list-system-processes still returns nil, but at least it doesn't crash.
8 Problem reported by Nelson H. F. Beebe in
9 <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
10
12013-03-05 Dmitry Antipov <dmantipov@yandex.ru> 112013-03-05 Dmitry Antipov <dmantipov@yandex.ru>
2 12
3 * composite.c (get_composition_id, fill_gstring_header): 13 * 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)
2543 2543
2544#elif defined BSD_SYSTEM 2544#elif defined BSD_SYSTEM
2545 2545
2546/* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with
2547 KERN_PROC2. MirBSD's KERN_PROC seems to be busted. */
2548# if !defined KERN_PROC || defined __MirBSD__
2549# undef KERN_PROC
2550# define KERN_PROC KERN_PROC2
2551# define kinfo_proc kinfo_proc2
2552# endif
2553
2546Lisp_Object 2554Lisp_Object
2547list_system_processes (void) 2555list_system_processes (void)
2548{ 2556{