From 9b1c32713812fa4e0085583469d9f739b7943d50 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 5 Mar 2013 13:56:36 -0800 Subject: [PATCH] Fix a build failure on OpenBSD 4.x and MirBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * sysdep.c (list_system_processes) [__OpenBSD__ || __MirBSD__]: Make it a stub in this case; otherwise the build might fail, and even if the build worked the function would just return nil anyway. Problem reported by Nelson H. F. Beebe in and analyzed by Jérémie Courrèges-Anglas in . Fixes: debbugs:13881 --- src/ChangeLog | 13 +++++++------ src/sysdep.c | 14 ++------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 91dc8b6d8c..18b22b5da4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,12 +1,13 @@ 2013-03-05 Paul Eggert - 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. + Fix a build failure on OpenBSD 4.x and MirBSD (Bug#13881). + * sysdep.c (list_system_processes) [__OpenBSD__ || __MirBSD__]: + Make it a stub in this case; otherwise the build might fail, + and even if the build worked the function would just return nil anyway. Problem reported by Nelson H. F. Beebe in - . + + and analyzed by Jérémie Courrèges-Anglas in + . 2013-03-02 Andreas Schwab diff --git a/src/sysdep.c b/src/sysdep.c index 9eba9e8681..80c7e0bc51 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2647,20 +2647,12 @@ list_system_processes (void) return proclist; } -#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 +#elif defined BSD_SYSTEM && !defined __OpenBSD__ && !defined __MirBSD__ Lisp_Object list_system_processes (void) { -#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__ +#if defined DARWIN_OS || defined __NetBSD__ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL}; #else int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC}; @@ -2688,8 +2680,6 @@ list_system_processes (void) { #if defined DARWIN_OS || defined __NetBSD__ 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 -- 2.39.2