aboutsummaryrefslogtreecommitdiffstats
path: root/src/sysdep.c
diff options
context:
space:
mode:
authorPaul Eggert2013-03-05 13:56:36 -0800
committerPaul Eggert2013-03-05 13:56:36 -0800
commit9b1c32713812fa4e0085583469d9f739b7943d50 (patch)
tree0dbe396edda203ceebed8e267abc7e383c9771d9 /src/sysdep.c
parent3b108d19a0fd9aaa37709d0be4bfc67884120f43 (diff)
downloademacs-9b1c32713812fa4e0085583469d9f739b7943d50.tar.gz
emacs-9b1c32713812fa4e0085583469d9f739b7943d50.zip
Fix a build failure on OpenBSD 4.x and MirBSD.
* 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 <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html> and analyzed by Jérémie Courrèges-Anglas in <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00062.html>. Fixes: debbugs:13881
Diffstat (limited to 'src/sysdep.c')
-rw-r--r--src/sysdep.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/sysdep.c b/src/sysdep.c
index 9eba9e86819..80c7e0bc51e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2647,20 +2647,12 @@ list_system_processes (void)
2647 return proclist; 2647 return proclist;
2648} 2648}
2649 2649
2650#elif defined BSD_SYSTEM 2650#elif defined BSD_SYSTEM && !defined __OpenBSD__ && !defined __MirBSD__
2651
2652/* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with
2653 KERN_PROC2. MirBSD's KERN_PROC seems to be busted. */
2654# if !defined KERN_PROC || defined __MirBSD__
2655# undef KERN_PROC
2656# define KERN_PROC KERN_PROC2
2657# define kinfo_proc kinfo_proc2
2658# endif
2659 2651
2660Lisp_Object 2652Lisp_Object
2661list_system_processes (void) 2653list_system_processes (void)
2662{ 2654{
2663#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__ 2655#if defined DARWIN_OS || defined __NetBSD__
2664 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL}; 2656 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
2665#else 2657#else
2666 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC}; 2658 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
@@ -2688,8 +2680,6 @@ list_system_processes (void)
2688 { 2680 {
2689#if defined DARWIN_OS || defined __NetBSD__ 2681#if defined DARWIN_OS || defined __NetBSD__
2690 proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist); 2682 proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
2691#elif defined __OpenBSD__
2692 proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);
2693#else 2683#else
2694 proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist); 2684 proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
2695#endif 2685#endif