* editfns.c (Voperating_system_release): Added.

	(init_editfns): Assign new variable operating-system-release
	based on call to uname if available.
	(get_operating_system_release): Added function to
	allow c-level access to operating system release.
* config.h: Regenerated.
* s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
	less.
	(MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
	using ptys as '7'.
* term/mac-win.el (process-connection-type): Removed.
	Controlled now by s/darwin.h:PTY_ITERATION.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 9f78405a43c..d8da3e3174c 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -107,6 +107,22 @@ Boston, MA 02111-1307, USA.  */
 
 #define HAVE_PTYS
 
+
+/*
+ * PTYs only work correctly on Darwin 7 or higher.  So make PTY_ITERATION
+ * Test the operating system release and only allow PTYs if it is greater
+ * than 7.
+ */
+#define MIN_PTY_KERNEL_VERSION '7' 
+#define PTY_ITERATION  \
+  char *release = get_operating_system_release();       \
+  if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION \
+                                  && release[1] == '.'))              \
+    return -1; \
+  for (c = FIRST_PTY_LETTER; c <= 'z'; c++)     \
+    for (i = 0; i < 16; i++)
+
+
 /*
  *      Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
  *      The 4.2 opendir, etc., library functions.