diff options
| author | Paul Eggert | 2012-07-06 03:08:57 +0000 |
|---|---|---|
| committer | Paul Eggert | 2012-07-06 03:08:57 +0000 |
| commit | 7dca65a4b4ff280171df473557d5fc0f98540200 (patch) | |
| tree | b703e6a714e38b3f4f0328f7dd095c15f3c8912e /src/sysdep.c | |
| parent | 8c6c57ea627f1d32ec1564fc86851974b19f1cb8 (diff) | |
| download | emacs-7dca65a4b4ff280171df473557d5fc0f98540200.tar.gz emacs-7dca65a4b4ff280171df473557d5fc0f98540200.zip | |
Port to OpenBSD 5.1 amd64.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 7a4fa9aa5f7..63bf680f17f 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -38,17 +38,17 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 38 | #include "sysselect.h" | 38 | #include "sysselect.h" |
| 39 | #include "blockinput.h" | 39 | #include "blockinput.h" |
| 40 | 40 | ||
| 41 | #ifdef __FreeBSD__ | 41 | #ifdef BSD_SYSTEM |
| 42 | #include <sys/param.h> | ||
| 42 | #include <sys/sysctl.h> | 43 | #include <sys/sysctl.h> |
| 44 | #endif | ||
| 45 | |||
| 46 | #ifdef __FreeBSD__ | ||
| 43 | #include <sys/user.h> | 47 | #include <sys/user.h> |
| 44 | #include <sys/resource.h> | 48 | #include <sys/resource.h> |
| 45 | #include <math.h> | 49 | #include <math.h> |
| 46 | #endif | 50 | #endif |
| 47 | 51 | ||
| 48 | #ifdef DARWIN_OS | ||
| 49 | #include <sys/sysctl.h> | ||
| 50 | #endif | ||
| 51 | |||
| 52 | #ifdef WINDOWSNT | 52 | #ifdef WINDOWSNT |
| 53 | #define read sys_read | 53 | #define read sys_read |
| 54 | #define write sys_write | 54 | #define write sys_write |
| @@ -2520,7 +2520,7 @@ list_system_processes (void) | |||
| 2520 | Lisp_Object | 2520 | Lisp_Object |
| 2521 | list_system_processes (void) | 2521 | list_system_processes (void) |
| 2522 | { | 2522 | { |
| 2523 | #ifdef DARWIN_OS | 2523 | #if defined DARWIN_OS || 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}; |
| @@ -2548,6 +2548,8 @@ list_system_processes (void) | |||
| 2548 | { | 2548 | { |
| 2549 | #ifdef DARWIN_OS | 2549 | #ifdef DARWIN_OS |
| 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__ | ||
| 2552 | proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist); | ||
| 2551 | #else | 2553 | #else |
| 2552 | proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist); | 2554 | proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist); |
| 2553 | #endif | 2555 | #endif |