[Emacs-diffs] Changes to emacs/src/s/darwin.h

[Steven Tamm]

Index: emacs/src/s/darwin.h
diff -c emacs/src/s/darwin.h:1.19 emacs/src/s/darwin.h:1.20
*** emacs/src/s/darwin.h:1.19   Thu Jan 20 18:13:48 2005
--- emacs/src/s/darwin.h        Sat Jan 22 15:54:04 2005
***************
*** 37,42 ****
--- 37,46 ----
  #define BSD_SYSTEM
  /* #define VMS */
  
+ #ifndef       DARWIN
+ #define       DARWIN 1
+ #endif
+ 
  /* MAC_OS is used to conditionally compile code common to both MAC_OS8
     and MAC_OSX.  */
  #ifdef MAC_OSX
***************
*** 103,127 ****
  
  /*
   *    Define HAVE_PTYS if the system supports pty devices.
   */
  
  #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
--- 107,123 ----
  
  /*
   *    Define HAVE_PTYS if the system supports pty devices.
+  *      Note: PTYs are broken on darwin <6.  Use at your own risk.
   */
  
  #define HAVE_PTYS
  
! /**
!  * 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' 
  
  /*
   *    Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate