diff options
| author | Glenn Morris | 2012-07-12 20:07:29 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-12 20:07:29 -0400 |
| commit | 6de0e799032b36bed7f7aa066a60d6c5ff9066b6 (patch) | |
| tree | 88ba5bd7da5125dfbc1387e4fa0caf348686ab82 /src | |
| parent | 4fae5a7a911b82e4d1c49810650fb6b488cb5a9e (diff) | |
| download | emacs-6de0e799032b36bed7f7aa066a60d6c5ff9066b6.tar.gz emacs-6de0e799032b36bed7f7aa066a60d6c5ff9066b6.zip | |
Remove macro MIN_PTY_KERNEL_VERSION, only used in one place
* src/process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.
* src/s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 3 | ||||
| -rw-r--r-- | src/s/darwin.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7e75fd0ae70..4f08d108f5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION. | ||
| 4 | * s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro. | ||
| 5 | |||
| 1 | 2012-07-12 Glenn Morris <rgm@gnu.org> | 6 | 2012-07-12 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Move to configure. | 8 | * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Move to configure. |
diff --git a/src/process.c b/src/process.c index 44f8520745d..ceb5c81d32b 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7398,8 +7398,7 @@ init_process_emacs (void) | |||
| 7398 | char const *release = (STRINGP (Voperating_system_release) | 7398 | char const *release = (STRINGP (Voperating_system_release) |
| 7399 | ? SSDATA (Voperating_system_release) | 7399 | ? SSDATA (Voperating_system_release) |
| 7400 | : 0); | 7400 | : 0); |
| 7401 | if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION | 7401 | if (!release || !release[0] || (release[0] < '7' && release[1] == '.')) { |
| 7402 | && release[1] == '.')) { | ||
| 7403 | Vprocess_connection_type = Qnil; | 7402 | Vprocess_connection_type = Qnil; |
| 7404 | } | 7403 | } |
| 7405 | } | 7404 | } |
diff --git a/src/s/darwin.h b/src/s/darwin.h index 9245a1b76d6..8b46113a720 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -30,10 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | distinguish OS X from pure Darwin. */ | 30 | distinguish OS X from pure Darwin. */ |
| 31 | #define DARWIN_OS | 31 | #define DARWIN_OS |
| 32 | 32 | ||
| 33 | /* PTYs only work correctly on Darwin 7 or higher. So make the default | ||
| 34 | for process-connection-type dependent on the kernel version. */ | ||
| 35 | #define MIN_PTY_KERNEL_VERSION '7' | ||
| 36 | |||
| 37 | /* Definitions for how to compile & link. */ | 33 | /* Definitions for how to compile & link. */ |
| 38 | #ifdef emacs | 34 | #ifdef emacs |
| 39 | #define malloc unexec_malloc | 35 | #define malloc unexec_malloc |