diff options
| author | Paul Eggert | 2013-03-04 18:03:05 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-03-04 18:03:05 -0800 |
| commit | 725eb02724597e4eddf2562aac20a3246cdda4ac (patch) | |
| tree | 4328616df182842d9f16b2efca85547c843e142f /src | |
| parent | 9450ac063cfe3a1d3ab6b24dc21f484006617f3f (diff) | |
| download | emacs-725eb02724597e4eddf2562aac20a3246cdda4ac.tar.gz emacs-725eb02724597e4eddf2562aac20a3246cdda4ac.zip | |
Fix a build failure on OpenBSD 4.x.
* sysdep.c (KERN_PROC, kinfo_proc) [BSD_SYSTEM && !KERN_PROC]:
Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9.
list-system-processes still returns nil, but at least it doesn't crash.
Problem reported by Nelson H. F. Beebe in
<http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/sysdep.c | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 25a0a100c68..874ea0486d6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-03-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix a build failure on OpenBSD 4.x. | ||
| 4 | * sysdep.c (KERN_PROC, kinfo_proc) [BSD_SYSTEM && !KERN_PROC]: | ||
| 5 | Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9. | ||
| 6 | list-system-processes still returns nil, but at least it doesn't crash. | ||
| 7 | Problem reported by Nelson H. F. Beebe in | ||
| 8 | <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>. | ||
| 9 | |||
| 1 | 2013-03-02 Andreas Schwab <schwab@linux-m68k.org> | 10 | 2013-03-02 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 11 | ||
| 3 | * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren. (Bug#13734) | 12 | * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren. (Bug#13734) |
diff --git a/src/sysdep.c b/src/sysdep.c index 47a14bdba35..392771bd121 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2649,6 +2649,13 @@ list_system_processes (void) | |||
| 2649 | 2649 | ||
| 2650 | #elif defined BSD_SYSTEM | 2650 | #elif defined BSD_SYSTEM |
| 2651 | 2651 | ||
| 2652 | /* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with | ||
| 2653 | KERN_PROC2. */ | ||
| 2654 | # ifndef KERN_PROC | ||
| 2655 | # define KERN_PROC KERN_PROC2 | ||
| 2656 | # define kinfo_proc kinfo_proc2 | ||
| 2657 | # endif | ||
| 2658 | |||
| 2652 | Lisp_Object | 2659 | Lisp_Object |
| 2653 | list_system_processes (void) | 2660 | list_system_processes (void) |
| 2654 | { | 2661 | { |