From: Glenn Morris <rgm@gnu.org>
Date: Fri, 13 Jul 2012 00:07:29 +0000 (-0400)
Subject: Remove macro MIN_PTY_KERNEL_VERSION, only used in one place
X-Git-Tag: emacs-24.2.90~1199^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6de0e799032b36bed7f7aa066a60d6c5ff9066b6;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e75fd0ae70..4f08d108f5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13  Glenn Morris  <rgm@gnu.org>
+
+	* process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.
+	* s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro.
+
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
 	* 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)
     char const *release = (STRINGP (Voperating_system_release)
 			   ? SSDATA (Voperating_system_release)
 			   : 0);
-    if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION
-				    && release[1] == '.')) {
+    if (!release || !release[0] || (release[0] < '7' && release[1] == '.')) {
       Vprocess_connection_type = Qnil;
     }
   }
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/>.  */
    distinguish OS X from pure Darwin.  */
 #define DARWIN_OS
 
-/* PTYs only work correctly on Darwin 7 or higher.  So make the default
-   for process-connection-type dependent on the kernel version.  */
-#define MIN_PTY_KERNEL_VERSION '7'
-
 /* Definitions for how to compile & link.  */
 #ifdef emacs
 #define malloc unexec_malloc