aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-07-06 19:25:28 -0700
committerPaul Eggert2012-07-06 19:25:28 -0700
commitf3047c750dddbf9fe0bb6211b868247b4fc1a3ea (patch)
tree5d7f7e3d8478a563ad829a6ac462ba096bec298e /src
parent31571fd712d8c1796f7d31739f1b48cf25948d64 (diff)
downloademacs-f3047c750dddbf9fe0bb6211b868247b4fc1a3ea.tar.gz
emacs-f3047c750dddbf9fe0bb6211b868247b4fc1a3ea.zip
* sysdep.c (list_system_processes): Port to NetBSD-current.
Fixes: debbugs:11797
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/sysdep.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 435c6d87050..47110ca04f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-07-07 Paul Eggert <eggert@cs.ucla.edu> 12012-07-07 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * sysdep.c (list_system_processes): Port to NetBSD-current (Bug#11797).
4
3 Do not require float-time's arg to fit in time_t (Bug#11825). 5 Do not require float-time's arg to fit in time_t (Bug#11825).
4 This works better on hosts where time_t is unsigned, and where 6 This works better on hosts where time_t is unsigned, and where
5 float-time is applied to the (negative) difference between two times. 7 float-time is applied to the (negative) difference between two times.
diff --git a/src/sysdep.c b/src/sysdep.c
index 63bf680f17f..cf646768af5 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2520,7 +2520,7 @@ list_system_processes (void)
2520Lisp_Object 2520Lisp_Object
2521list_system_processes (void) 2521list_system_processes (void)
2522{ 2522{
2523#if defined DARWIN_OS || defined __OpenBSD__ 2523#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__
2524 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL}; 2524 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
2525#else 2525#else
2526 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC}; 2526 int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
@@ -2546,7 +2546,7 @@ list_system_processes (void)
2546 len /= sizeof (struct kinfo_proc); 2546 len /= sizeof (struct kinfo_proc);
2547 for (i = 0; i < len; i++) 2547 for (i = 0; i < len; i++)
2548 { 2548 {
2549#ifdef DARWIN_OS 2549#if defined DARWIN_OS || defined __NetBSD__
2550 proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist); 2550 proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
2551#elif defined __OpenBSD__ 2551#elif defined __OpenBSD__
2552 proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist); 2552 proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);