🚀 go-pugleaf

Hi,
Just completed installing epoch.  The porting effort is the result of many hands
within Sun, as you can imagine.  I used the work of Steve Byrne <sbb@eng.sun.com>
and Brendan Lynch <blynch@east.sun.com> as my base before achieving a patch
that applies to epcoh-4.0px.  Please use the enclosed shar of my effort to
update the distribution sources.  Should I also submit the share to
gnu.epoch.misc or leave that to you and your team?

Regards,
ger

#! /bin/sh
# This is a shell archive.  Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file".  To overwrite existing
# files, type "sh file -c".  You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g..  If this archive is complete, you
# will see the following message at the end:
#		"End of shell archive."
# Contents:  README-solaris-2.0 epoch-4.0p2.solaris-2.0.patch
# Wrapped by gerrys@tournesol on Thu Jul  2 13:03:00 1992
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f README-solaris-2.0 -a "${1}" != "-c" ; then 
  echo shar: Will not over-write existing file \"README-solaris-2.0\"
else
echo shar: Extracting \"README-solaris-2.0\" \(676 characters\)
sed "s/^X//" >README-solaris-2.0 <<'END_OF_README-solaris-2.0'
X
X	SOLARIS/EPOCH INSTALL
X
X1.	Apply epoch-4.0p2.solaris-2.0.patch to your copy of epoch-4.0p2
X	using
X		patch < epoch-4.0p2.solaris-2.0.patch.
X	If your directory is different than mine, try patch -p0 <...
X	or other combination of this flag.
X
X2.	Read INSTALL and README in the epoch-4.0p2 directory.
X
X3.	Make any necessary adjustments.  Remember to comment out the line:
X		/* #define X11 /**/
X	as shown here in ascii/config.h.
X	Failure to do so will result in no ascii emacs.
X
X4.	You may now perform the make (recommended) or use build-install.
X
X5.	You may now do the install.  Here's how:
X
X		make install
X
X	Ensure that /usr/ucb/install is first in your path.
X
X6.	Start using it.
END_OF_README-solaris-2.0
if test 676 -ne `wc -c <README-solaris-2.0`; then
    echo shar: \"README-solaris-2.0\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test -f epoch-4.0p2.solaris-2.0.patch -a "${1}" != "-c" ; then 
  echo shar: Will not over-write existing file \"epoch-4.0p2.solaris-2.0.patch\"
else
echo shar: Extracting \"epoch-4.0p2.solaris-2.0.patch\" \(34990 characters\)
sed "s/^X//" >epoch-4.0p2.solaris-2.0.patch <<'END_OF_epoch-4.0p2.solaris-2.0.patch'
Xdiff -crN epoch-4.0p1/ascii/Makefile epoch/ascii/Makefile
X*** epoch-4.0p1/ascii/Makefile	Mon Apr 20 10:53:23 1992
X--- epoch/ascii/Makefile	Thu Apr 23 21:53:32 1992
X***************
X*** 1,4 ****
X! CPP = $(CC) -E
X  MAKE = make  # BSD doesn't have it as a default.
X  #Note: an alternative is  CPP = /lib/cpp
X  
X--- 1,5 ----
X! EPPP = $(CC) -E
X! CPP = $(CC) -E -Xs
X  MAKE = make  # BSD doesn't have it as a default.
X  #Note: an alternative is  CPP = /lib/cpp
X  
Xdiff -crN epoch-4.0p1/ascii/fileio.c epoch/ascii/fileio.c
X*** epoch-4.0p1/ascii/fileio.c	Mon Apr 20 10:53:34 1992
X--- epoch/ascii/fileio.c	Thu Apr 23 22:08:16 1992
X***************
X*** 39,46 ****
X  #include <perror.h>
X  #include <stddef.h>
X  #include <string.h>
X- #else
X- #include <sys/dir.h>
X  #endif
X  #include <errno.h>
X  
X--- 39,44 ----
Xdiff -crN epoch-4.0p1/ascii/fns.c epoch/ascii/fns.c
X*** epoch-4.0p1/ascii/fns.c	Mon Apr 20 10:53:34 1992
X--- epoch/ascii/fns.c	Fri Apr 24 01:34:15 1992
X***************
X*** 46,51 ****
X--- 46,55 ----
X  #ifndef NLIST_STRUCT
X  #include <a.out.h> 
X  #else /* NLIST_STRUCT */
X+ #ifdef SUNOS_5
X+ #include <fcntl.h>
X+ #include <kvm.h>
X+ #endif
X  #include <nlist.h>
X  #endif /* NLIST_STRUCT */
X  #endif /* not VMS */
X***************
X*** 1170,1175 ****
X--- 1174,1183 ----
X  #endif /* eunice */
X  #endif /* VMS */
X  
X+ #ifdef SUNOS_5
X+   static kvm_t *kd;
X+ #endif /* SUNOS_5 */
X+ 
X    /* If this fails for any reason, we can return (0 0 0) */
X    load_ave[0] = 0.0; load_ave[1] = 0.0; load_ave[2] = 0.0;
X  
X***************
X*** 1240,1250 ****
X--- 1248,1267 ----
X  	    nl[0].n_value &= 0x7fffffff;
X  	}
X  #else
X+ #ifdef SUNOS_5
X+       if (initialized == 0) {
X+           if ((kd = kvm_open(0, 0, 0, O_RDONLY, 0)) != 0) {
X+               initialized = 1;
X+               kvm_nlist(kd, nl);
X+           }
X+       }
X+ #else /* SUNOS_5 */
X  #ifdef NeXT
X        nlist (KERN_FILE, nl);
X  #else      
X        nlist (KERNEL_FILE, nl);
X  #endif      
X+ #endif /* SUNOS_5 */
X  #endif /* IRIS */
X  
X  #ifdef FIXUP_KERNEL_SYMBOL_ADDR
X***************
X*** 1252,1257 ****
X--- 1269,1275 ----
X  	nl[0].n_value = (nlp->n_value >> 2) | 0xc0000000;
X  #endif /* FIXUP_KERNEL_SYMBOL_ADDR */
X      }
X+ #ifndef SUNOS_5
X    /*
X     *	Make sure we have /dev/kmem open
X     */
X***************
X*** 1263,1273 ****
X--- 1281,1303 ----
X        channel = open ("/dev/kmem", 0);
X        if (channel >= 0) initialized = 1;
X      }
X+ #endif /* !SUNOS_5 */
X    /*
X     *	If we can, get the load ave values
X     */
X    if ((nl[0].n_value != 0) && (initialized != 0))
X      {
X+ #ifdef SUNOS_5
X+       /*
X+        * try to read load
X+        */
X+       if (kvm_read(kd, nl[0].n_value, (char *)load_ave, sizeof(load_ave))
X+         != sizeof(load_ave))
X+         {
X+          kvm_close(kd);
X+          initialized = 0;
X+       }
X+ #else /* SUNOS_5 */
X        /*
X         *	Seek to the correct address
X         */
X***************
X*** 1278,1283 ****
X--- 1308,1314 ----
X  	  close (channel);
X  	  initialized = 0;
X  	}
X+ #endif /* SUNOS_5 */
X      }
X  #endif /* not VMS */
X  
Xdiff -crN epoch-4.0p1/ascii/keyboard.c epoch/ascii/keyboard.c
X*** epoch-4.0p1/ascii/keyboard.c	Mon Apr 20 10:53:37 1992
X--- epoch/ascii/keyboard.c	Fri May  1 00:07:57 1992
X***************
X*** 202,207 ****
X--- 202,214 ----
X  
X  int flow_control;
X  
X+ #ifdef USG5_4
X+ #define sigfree() {sigset_t tmp; sigemptyset(&tmp); sigprocmask (SIG_SETMASK, &tmp, 0);}
X+ #define sigholdx(sig) sighold(sig)
X+ #define sigblockx(sig) sighold (sig)
X+ #define sigunblockx(sig) sigrelse (sig)
X+ #define sigpausex(sig) sigpause (sig)
X+ #else
X  #ifndef BSD4_1
X  #define sigfree() sigsetmask (SIGEMPTYMASK)
X  #define sigholdx(sig) sigsetmask (sigmask (sig))
X***************
X*** 209,214 ****
X--- 216,222 ----
X  #define sigunblockx(sig) sigblock (SIGEMPTYMASK)
X  #define sigpausex(sig) sigpause (0)
X  #endif /* not BSD4_1 */
X+ #endif /* USG5_4 */
X  
X  #ifdef BSD4_1
X  #define SIGIO SIGTINT
X***************
X*** 1211,1220 ****
X--- 1219,1237 ----
X      /* It seems there is a timing error such that a SIGIO can be handled here
X         and cause kbd_count to become nonzero even though raising of SIGIO
X         has already been turned off.  */
X+ #ifdef USG5_4
X+     sigset_t omask;
X+     sigprocmask (0, 0, &omask);
X+     sighold (SIGIO);
X+     if (kbd_count == 0)
X+       read_avail_input (*addr);
X+     sigprocmask (SIG_SETMASK, &omask, 0);
X+ #else
X      SIGMASKTYPE mask = sigblock (sigmask (SIGIO));
X      if (kbd_count == 0)
X        read_avail_input (*addr);
X      sigsetmask (mask);
X+ #endif
X    }
X  #else
X    /* If we can't count the input, read it (if any) and see what we got.  */
Xdiff -crN epoch-4.0p1/ascii/lisp.h epoch/ascii/lisp.h
X*** epoch-4.0p1/ascii/lisp.h	Mon Apr 20 10:53:38 1992
X--- epoch/ascii/lisp.h	Fri Apr 24 01:28:37 1992
X***************
X*** 242,248 ****
X--- 242,253 ----
X  #define VALMASK ((1<<VALBITS) - 1)
X  #endif
X  #define GCTYPEMASK ((1<<GCTYPEBITS) - 1)
X+ #ifdef __STDC__
X+ /* Need to make sure this deals with unsigneds */
X+ #define	MARKBIT ((1U) << (VALBITS + GCTYPEBITS))
X+ #else
X  #define MARKBIT (1 << (VALBITS + GCTYPEBITS))
X+ #endif
X  
X  #endif /* NO_UNION_TYPE */
X  
Xdiff -crN epoch-4.0p1/ascii/process.c epoch/ascii/process.c
X*** epoch-4.0p1/ascii/process.c	Mon Apr 20 10:53:42 1992
X--- epoch/ascii/process.c	Fri May  1 00:08:51 1992
X***************
X*** 189,194 ****
X--- 189,197 ----
X  extern sys_nerr;
X  extern char *sys_errlist[];
X  
X+ #ifdef SYS_SIGLIST
X+ #define sys_siglist SYS_SIGLIST
X+ #else
X  #ifndef BSD4_1
X  extern char *sys_siglist[];
X  #else
X***************
X*** 222,227 ****
X--- 225,231 ----
X      "exceeded file size limit"
X      };
X  #endif
X+ #endif /* SYS_SIGLIST */
X  
X  #ifdef vipc
X  
X***************
X*** 1253,1259 ****
X  	  }
X  #endif /* not UNIPLUS and not RTU */
X  #ifdef SETUP_SLAVE_PTY
X! 	SETUP_SLAVE_PTY;
X  #endif /* SETUP_SLAVE_PTY */
X  #ifdef AIX
X  	/* On AIX, we've disabled SIGHUP above once we start a child on a pty.
X--- 1257,1265 ----
X  	  }
X  #endif /* not UNIPLUS and not RTU */
X  #ifdef SETUP_SLAVE_PTY
X! 	if (pty_flag) {
X! 	  SETUP_SLAVE_PTY;
X! 	}
X  #endif /* SETUP_SLAVE_PTY */
X  #ifdef AIX
X  	/* On AIX, we've disabled SIGHUP above once we start a child on a pty.
X***************
X*** 1748,1757 ****
X--- 1754,1765 ----
X  	    error("select error: %s", sys_errlist[xerrno]);
X  	}
X  #if defined (sun) || defined (APOLLO)
X+ #ifndef USG5_4
X        else if (nfds > 0 && FD_ISSET (0, &Available) && interrupt_input)
X  	/* System sometimes fails to deliver SIGIO.  */
X  	kill (getpid (), SIGIO);
X  #endif
X+ #endif
X  
X        /* Check for keyboard input */
X        /* If there is any, return immediately
X***************
X*** 2226,2232 ****
X--- 2234,2244 ----
X    /* gid may be a pid, or minus a pgrp's number */
X  #ifdef TIOCSIGSEND
X    if (!NULL (current_group))
X+ #ifdef TIOCSIGNAL     /* SIGSEND is really SIGNAL */
X+     ioctl (XFASTINT (p->infd), TIOCSIGNAL, &signo);
X+ #else
X      ioctl (XFASTINT (p->infd), TIOCSIGSEND, signo);
X+ #endif
X    else
X      {
X        gid = - XFASTINT (p->pid);
Xdiff -crN epoch-4.0p1/ascii/sysdep.c epoch/ascii/sysdep.c
X*** epoch-4.0p1/ascii/sysdep.c	Mon Apr 20 10:53:44 1992
X--- epoch/ascii/sysdep.c	Fri May  1 00:09:53 1992
X***************
X*** 91,96 ****
X--- 91,100 ----
X  #endif
X  #ifdef USG
X  #include <fcntl.h>
X+ #ifdef USG5_4
X+ #undef FASYNC
X+ #include <sys/filio.h>
X+ #endif
X  #endif
X  #endif /* not 4.1 bsd */
X  
X***************
X*** 104,112 ****
X  #ifdef BSD4_1
X  #include <wait.h>
X  #else /* not 4.1 */
X- #ifdef SYSVR4
X  #include <sys/wait.h>
X- #endif
X  #endif /* not 4.1 */
X  #endif /* BSD */
X  
X--- 108,114 ----
X***************
X*** 817,823 ****
X  }
X  
X  #else /* no FASYNC */
X! #ifdef STRIDE		/* Stride doesn't have FASYNC - use FIOASYNC */
X  
X  request_sigio ()
X  {
X--- 819,825 ----
X  }
X  
X  #else /* no FASYNC */
X! #if defined(STRIDE) || defined(SUNOS_5)	/* Stride doesn't have FASYNC - use FIOASYNC */
X  
X  request_sigio ()
X  {
X***************
X*** 1617,1625 ****
X--- 1619,1632 ----
X  #ifdef DATA_START
X    return ((char *) DATA_START);
X  #else
X+ #ifdef USG5_4
X+   extern etext;
X+   return &etext;
X+ #else
X    extern int data_start;
X    return ((char *) &data_start);
X  #endif
X+ #endif
X  }
X  #endif /* NEED_STARTS (not CANNOT_DUMP or not SYSTEM_MALLOC) */
X  
X***************
X*** 2380,2385 ****
X--- 2387,2393 ----
X   *	always negligible.   Fred Fish, Unisoft Systems Inc.
X   */
X  
X+ #ifndef SYS_SIGLIST
X  char *sys_siglist[NSIG + 1] =
X  {
X  #ifdef AIX
X***************
X*** 2440,2445 ****
X--- 2448,2454 ----
X  #endif /* not AIX */
X    0
X    };
X+ #endif /* SYS_SIGLIST */
X  
X  /*
X   *	Warning, this function may not duplicate 4.2 action properly
Xdiff -crN epoch-4.0p1/ascii/ymakefile epoch/ascii/ymakefile
X*** epoch-4.0p1/ascii/ymakefile	Mon Apr 20 10:53:51 1992
X--- epoch/ascii/ymakefile	Fri May  1 02:06:17 1992
X***************
X*** 149,154 ****
X--- 149,156 ----
X  /* LOCALCPP is the local one or nothing.
X     CPP is the local one or the standardone.  */
X  LOCALCPP= localcpp
X+ #else
X+ LOCALCPP=
X  #endif /* NEED_CPP */
X  
X  #ifdef SHORTNAMES
X***************
X*** 155,161 ****
X  SHORT= shortnames
X  #endif /* SHORTNAMES */
X  
X! CFLAGS= C_DEBUG_SWITCH -Demacs $(MYCPPFLAG) C_SWITCH_MACHINE C_SWITCH_SYSTEM
X  /* DO NOT use -R.  There is a special hack described in lastfile.c
X     which is used instead.  Some initialized data areas are modified
X     at initial startup, then labeled as part of the text area when
X--- 157,163 ----
X  SHORT= shortnames
X  #endif /* SHORTNAMES */
X  
X! CFLAGS= C_OPTIMIZE_SWITCH -Demacs $(MYCPPFLAG) C_SWITCH_MACHINE C_SWITCH_SYSTEM
X  /* DO NOT use -R.  There is a special hack described in lastfile.c
X     which is used instead.  Some initialized data areas are modified
X     at initial startup, then labeled as part of the text area when
Xdiff -crN epoch-4.0p1/epoch-lisp/epoch.el epoch/epoch-lisp/epoch.el
X*** epoch-4.0p1/epoch-lisp/epoch.el	Thu Apr 23 15:29:49 1992
X--- epoch/epoch-lisp/epoch.el	Fri May  1 02:06:23 1992
X***************
X*** 39,50 ****
X  ;; user-definable switches
X  
X  ;; auto-raise on focus event.
X! (defvar auto-raise-screen t
X    "If set t, focus events will raise screen and minibuffer.  If set to 'screen, only edit screen will raise.  If set to 'minibuf, only minibuffer screen will raise.  If set to nil, no screens will be raised."
X  )
X  
X  ;; include system name in screen titles
X! (defvar include-system-name t
X  "Sets the system name to be included in the screen title")
X  
X  ;;; --------------------------------------------------------------------------
X--- 39,50 ----
X  ;; user-definable switches
X  
X  ;; auto-raise on focus event.
X! (defvar auto-raise-screen nil
X    "If set t, focus events will raise screen and minibuffer.  If set to 'screen, only edit screen will raise.  If set to 'minibuf, only minibuffer screen will raise.  If set to nil, no screens will be raised."
X  )
X  
X  ;; include system name in screen titles
X! (defvar include-system-name nil
X  "Sets the system name to be included in the screen title")
X  
X  ;;; --------------------------------------------------------------------------
XBinary files epoch-4.0p1/etc/DOC and epoch/etc/DOC differ
XBinary files epoch-4.0p1/lisp/sc-alist.elc and epoch/lisp/sc-alist.elc differ
Xdiff -crN epoch-4.0p1/src/ChangeLog epoch/src/ChangeLog
X*** epoch-4.0p1/src/ChangeLog	Thu Apr 23 15:30:28 1992
X--- epoch/src/ChangeLog	Fri May  1 02:06:44 1992
X***************
X*** 886,891 ****
X--- 886,899 ----
X  	selective_display.
X  	(redisplay): use correct tab_offset in call to compute_motion.
X  
X+ Wed Feb 19 13:21:21 1992  Brendan Lynch - Sun BOS Software  (blynch at East.Sun.COM)
X+ 
X+ 	* process.c (process_send_signal): Although SVr4 'TIOCSIGNAL' is
X+ 	  almost the same as 'TIOCSIGSEND', it requires its argument to be
X+ 	  a pointer to the signal value, not the signal value itself.  Add
X+ 	  "#ifdef TIOCSIGNAL" case *inside* "#ifdef TIOCSIGSEND" to handle
X+ 	  this difference.
X+ 
X  Thu Feb  6 11:16:57 1992  Christopher Love  (love at ash.cs.uiuc.edu)
X  
X  	* Makefile - clean should remove epoch, not xemacs.
Xdiff -crN epoch-4.0p1/src/Makefile epoch/src/Makefile
X*** epoch-4.0p1/src/Makefile	Mon Apr 20 11:00:09 1992
X--- epoch/src/Makefile	Fri May  1 02:06:45 1992
X***************
X*** 4,10 ****
X  # $Date: 92/02/23 10:58:49 $
X  # $Author: love $
X  #
X! CPP = $(CC) -E
X  MAKE = make  # BSD doesn't have it as a default.
X  #Note: an alternative is  CPP = /lib/cpp
X  
X--- 4,11 ----
X  # $Date: 92/02/23 10:58:49 $
X  # $Author: love $
X  #
X! ECPP = $(CC) -E
X! CPP = $(CC) -E -Xs
X  MAKE = make  # BSD doesn't have it as a default.
X  #Note: an alternative is  CPP = /lib/cpp
X  
X***************
X*** 41,47 ****
X  	cp ymakefile junk.c
X  	$(CPP) junk.c | sed -e 's/^#.*//' -e 's/^[ 	][ 	]*$$//' -e 's/^ /	/' | \
X  	sed -n -e '/^..*$$/p' > xmakefile
X! 	rm -f junk.c
X  
X  tags:
X  	etags [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../epoch-lisp/[a-z]*.el
X--- 42,48 ----
X  	cp ymakefile junk.c
X  	$(CPP) junk.c | sed -e 's/^#.*//' -e 's/^[ 	][ 	]*$$//' -e 's/^ /	/' | \
X  	sed -n -e '/^..*$$/p' > xmakefile
X! 	-rm -f junk.c
X  
X  tags:
X  	etags [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../epoch-lisp/[a-z]*.el
Xdiff -crN epoch-4.0p1/src/config/m-sparc.h epoch/src/config/m-sparc.h
X*** epoch-4.0p1/src/config/m-sparc.h	Mon Apr 20 11:02:22 1992
X--- epoch/src/config/m-sparc.h	Thu Apr 23 19:17:02 1992
X***************
X*** 49,54 ****
X--- 49,55 ----
X  
X  /* This level of optimization is reported to work.  */
X  
X+ #ifndef C_OPTIMIZE_SWITCH
X  #ifdef __GNUC__
X  # define C_OPTIMIZE_SWITCH -O
X  #else
X***************
X*** 55,65 ****
X--- 56,72 ----
X       /* This level of optimization is reported to work.  */
X  # define C_OPTIMIZE_SWITCH -O2
X  #endif
X+ #endif
X  
X  /* Use type int rather than a union, to represent Lisp_Object */
X  
X  #define NO_UNION_TYPE
X  
X+ /* And we can get a couple more bits of precious integer space... */
X+ 
X+ #define VALBITS 26
X+ #define GCTYPEBITS 5
X+ 
X  /* XINT must explicitly sign-extend */
X  
X  #define EXPLICIT_SIGN_EXTEND
X***************
X*** 70,76 ****
X--- 77,85 ----
X  
X  /* Convert that into an integer that is 100 for a load average of 1.0  */
X  
X+ #ifndef LOAD_AVE_CVT
X  #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
X+ #endif
X  
X  /* Define C_ALLOCA if this machine does not support a true alloca
X     and the one written in C should be used instead.
Xdiff -crN epoch-4.0p1/src/config/s-sunos5.h epoch/src/config/s-sunos5.h
X*** epoch-4.0p1/src/config/s-sunos5.h
X--- epoch/src/config/s-sunos5.h	Mon Apr 27 01:29:09 1992
X***************
X*** 0 ****
X--- 1,73 ----
X+ /* Definitions file for GNU Emacs running on AT&T's System V Release 4
X+    Copyright (C) 1987, 1990 Free Software Foundation, Inc.
X+ 
X+ This file is part of GNU Emacs.
X+ 
X+ GNU Emacs is free software; you can redistribute it and/or modify
X+ it under the terms of the GNU General Public License as published by
X+ the Free Software Foundation; either version 1, or (at your option)
X+ any later version.
X+ 
X+ GNU Emacs is distributed in the hope that it will be useful,
X+ but WITHOUT ANY WARRANTY; without even the implied warranty of
X+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
X+ GNU General Public License for more details.
X+ 
X+ You should have received a copy of the GNU General Public License
X+ along with GNU Emacs; see the file COPYING.  If not, write to
X+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
X+ 
X+ /* Hacked for SunOS 5.0 by Steve Byrne -- sbb@eng.sun.com
X+  * and by Brendan Lynch - blynch@east.sun.com
X+  */
X+ 
X+ /* Use the SysVr4 file for at least base configuration. */
X+ 
X+ #include "s-usg5-4.h"
X+ 
X+ /* Get rid of unneeded definitions in s-usg5-3.h */
X+ #undef LIBX10_SYSTEM
X+ #undef LIBX11_SYSTEM
X+ 
X+ /* Define our SVr4 identity */
X+ #define USG5_4
X+ /* And our Sun-nature */
X+ #define SUNOS_5
X+ /* But deny any BSD-isms */
X+ #undef BSD
X+ 
X+ #define subprocesses
X+ 
X+ #define HAVE_SOCKETS
X+ #define SYS_SIGLIST  _sys_siglist
X+ 
X+ /* SunOS5 CAN use SIGIO (really SIGPOLL) along with interrupting input */
X+ #define SIGIO SIGPOLL
X+ 
X+ 
X+ /* We dont need any of the loader magic */
X+ #undef START_FILES
X+ #define START_FILES
X+ 
X+ #undef LIB_STANDARD
X+ #define LIB_STANDARD -lkvm -lsocket -lnsl -lelf
X+ 
X+ /* Don't need data_seg bits */
X+ #undef DATA_SEG_BITS
X+ 
X+ /* Don't do any mucking with the loader -- use cc to link */
X+ #define LINKER cc
X+ 
X+ #define C_OPTIMIZE_SWITCH -fast
X+ 
X+ /* Cause the compilation of oldxmenu to use the right -I option.  */
X+ #define OLDXMENU_OPTIONS CFLAGS=C_SWITCH_SYSTEM
X+ 
X+ /* The following is needed to work with the "Open Windows"
X+    version of X windows.  But it should do no harm if you don't have that.  */
X+ #if 1  /* The -I and -L options should be harmless otherwise.  */
X+ #undef LD_SWITCH_SYSTEM
X+ #define LD_SWITCH_SYSTEM -L/usr/openwin/lib
X+ 
X+ #define C_SWITCH_SYSTEM -I/usr/openwin/include
X+ #endif 
Xdiff -crN epoch-4.0p1/src/config/s-usg5-4.h epoch/src/config/s-usg5-4.h
X*** epoch-4.0p1/src/config/s-usg5-4.h	Mon Apr 20 11:02:49 1992
X--- epoch/src/config/s-usg5-4.h	Thu Apr 23 20:40:41 1992
X***************
X*** 128,144 ****
X  #define PTY_TTY_NAME_SPRINTF			\
X    {						\
X      char *ptsname(), *ptyname;			\
X  						\
X      sighold(SIGCLD);				\
X!     if (grantpt(fd) == -1)			\
X!       fatal("could not grant slave pty");	\
X      sigrelse(SIGCLD);				\
X!     if (unlockpt(fd) == -1)			\
X!       fatal("could not unlock slave pty");	\
X!     if (!(ptyname = ptsname(fd)))		\
X!       fatal ("could not enable slave pty");	\
X!     strncpy(pty_name, ptyname, sizeof(pty_name)); \
X!     pty_name[sizeof(pty_name) - 1] = 0;		\
X    }
X  
X  /* Push various streams modules onto a PTY channel. */
X--- 128,149 ----
X  #define PTY_TTY_NAME_SPRINTF			\
X    {						\
X      char *ptsname(), *ptyname;			\
X+     int trc;					\
X  						\
X+     pty_name[0] = '\0';				\
X      sighold(SIGCLD);				\
X!     trc = grantpt(fd);				\
X      sigrelse(SIGCLD);				\
X!     if (trc == -1)				\
X!       error("could not grant slave pty");	\
X!     else if (unlockpt(fd) == -1)		\
X!       error("could not unlock slave pty");	\
X!     else if (!(ptyname = ptsname(fd)))		\
X!       error ("could not enable slave pty");	\
X!     else {					\
X!       strncpy(pty_name, ptyname, sizeof(pty_name)); \
X!       pty_name[sizeof(pty_name) - 1] = 0;	\
X!     }						\
X    }
X  
X  /* Push various streams modules onto a PTY channel. */
Xdiff -crN epoch-4.0p1/src/emacs.c epoch/src/emacs.c
X*** epoch-4.0p1/src/emacs.c	Mon Apr 20 11:00:34 1992
X--- epoch/src/emacs.c	Fri May  1 02:07:03 1992
X***************
X*** 146,151 ****
X--- 146,152 ----
X  int fatal_error_in_progress;
X  
X  /* Handle bus errors, illegal instruction, etc. */
X+ VOID
X  fatal_error_signal (sig)
X       int sig;
X  {
X***************
X*** 261,267 ****
X        printf("malloc jumpstart failed\n");
X  #endif  
X  
X!   distinct_minibuffer = 1;	/* Default */
X  
X  /* Map in shared memory, if we are using that.  */
X  #ifdef HAVE_SHM
X--- 262,268 ----
X        printf("malloc jumpstart failed\n");
X  #endif  
X  
X!   distinct_minibuffer = 0;	/* Default */
X  
X  /* Map in shared memory, if we are using that.  */
X  #ifdef HAVE_SHM
Xdiff -crN epoch-4.0p1/src/fileio.c epoch/src/fileio.c
X*** epoch-4.0p1/src/fileio.c	Mon Apr 20 11:00:38 1992
X--- epoch/src/fileio.c	Fri May  1 02:07:06 1992
X***************
X*** 48,55 ****
X  #include <perror.h>
X  #include <stddef.h>
X  #include <string.h>
X- #else
X- #include <sys/dir.h>
X  #endif
X  #include <errno.h>
X  
X--- 48,53 ----
X***************
X*** 72,77 ****
X--- 70,81 ----
X  #include "lisp.h"
X  #include "buffer.h"
X  #include "window.h"
X+ 
X+ #ifdef SYSV_SYSTEM_DIR
X+ #include <dirent.h>
X+ #else
X+ #include <sys/dir.h>
X+ #endif
X  
X  #ifdef VMS
X  #include <file.h>
Xdiff -crN epoch-4.0p1/src/fns.c epoch/src/fns.c
X*** epoch-4.0p1/src/fns.c	Mon Apr 20 11:00:39 1992
X--- epoch/src/fns.c	Fri May  1 02:07:08 1992
X***************
X*** 55,60 ****
X--- 55,64 ----
X  #ifndef NLIST_STRUCT
X  #include <a.out.h> 
X  #else /* NLIST_STRUCT */
X+ #ifdef SUNOS_5
X+ #include <fcntl.h>
X+ #include <kvm.h>
X+ #endif
X  #include <nlist.h>
X  #endif /* NLIST_STRUCT */
X  #endif /* not VMS */
X***************
X*** 1167,1172 ****
X--- 1171,1180 ----
X  #endif /* eunice */
X  #endif /* VMS */
X  
X+ #ifdef SUNOS_5
X+   static kvm_t *kd;
X+ #endif /* SUNOS_5 */
X+ 
X    /* If this fails for any reason, we can return (0 0 0) */
X    load_ave[0] = 0.0; load_ave[1] = 0.0; load_ave[2] = 0.0;
X  
X***************
X*** 1237,1247 ****
X--- 1245,1264 ----
X  	    nl[0].n_value &= 0x7fffffff;
X  	}
X  #else
X+ #ifdef SUNOS_5
X+       if (initialized == 0) {
X+ 	    if ((kd = kvm_open(0, 0, 0, O_RDONLY, 0)) != 0) {
X+ 		initialized = 1;
X+ 		kvm_nlist(kd, nl);
X+ 	    }
X+       }
X+ #else /* SUNOS_5 */
X  #ifdef NeXT
X        nlist (KERN_FILE, nl);
X  #else      
X        nlist (KERNEL_FILE, nl);
X  #endif /* NeXT */      
X+ #endif /* SUNOS_5 */
X  #endif /* IRIS */
X  
X  #ifdef FIXUP_KERNEL_SYMBOL_ADDR
X***************
X*** 1249,1254 ****
X--- 1266,1272 ----
X  	nl[0].n_value = (nlp->n_value >> 2) | 0xc0000000;
X  #endif /* FIXUP_KERNEL_SYMBOL_ADDR */
X      }
X+ #ifndef SUNOS_5
X    /*
X     *	Make sure we have /dev/kmem open
X     */
X***************
X*** 1260,1270 ****
X--- 1278,1300 ----
X        channel = open ("/dev/kmem", 0);
X        if (channel >= 0) initialized = 1;
X      }
X+ #endif /* !SUNOS_5 */
X    /*
X     *	If we can, get the load ave values
X     */
X    if ((nl[0].n_value != 0) && (initialized != 0))
X      {
X+ #ifdef SUNOS_5
X+       /*
X+        * try to read load
X+        */
X+       if (kvm_read(kd, nl[0].n_value, (char *)load_ave, sizeof(load_ave))
X+ 	  != sizeof(load_ave))
X+         {
X+ 	   kvm_close(kd);
X+ 	   initialized = 0;
X+ 	}
X+ #else /* SUNOS_5 */
X        /*
X         *	Seek to the correct address
X         */
X***************
X*** 1275,1280 ****
X--- 1305,1311 ----
X  	  close (channel);
X  	  initialized = 0;
X  	}
X+ #endif /* SUNOS_5 */
X      }
X  #endif /* not VMS */
X  
Xdiff -crN epoch-4.0p1/src/getpagesize.h epoch/src/getpagesize.h
X*** epoch-4.0p1/src/getpagesize.h	Mon Apr 20 11:00:40 1992
X--- epoch/src/getpagesize.h	Fri May  1 02:11:43 1992
X***************
X*** 6,11 ****
X--- 6,18 ----
X  
X  #ifndef HAVE_GETPAGESIZE
X  
X+ #ifdef USG5_4
X+ 
X+ #include <unistd.h>
X+ #define getpagesize()	sysconf(_SC_PAGESIZE)
X+ 
X+ #else	/* USG5_4 */
X+ 
X  #ifdef VMS
X  #include "param.h"
X  #else
X***************
X*** 24,29 ****
X--- 31,38 ----
X  #define getpagesize() NBPC
X  #endif /* no NBPG */
X  #endif /* no EXEC_PAGESIZE */
X+ 
X+ #endif /* USG5_4 */
X  
X  #endif /* not HAVE_GETPAGESIZE */
X  
Xdiff -crN epoch-4.0p1/src/keyboard.c epoch/src/keyboard.c
X*** epoch-4.0p1/src/keyboard.c	Mon Apr 20 11:00:45 1992
X--- epoch/src/keyboard.c	Fri May  1 02:07:13 1992
X***************
X*** 213,218 ****
X--- 213,225 ----
X  
X  int flow_control;
X  
X+ #ifdef USG5_4
X+ #define sigfree() {sigset_t tmp; sigemptyset(&tmp); sigprocmask (SIG_SETMASK, &tmp, 0);}
X+ #define sigholdx(sig) sighold(sig)
X+ #define sigblockx(sig) sighold (sig)
X+ #define sigunblockx(sig) sigrelse (sig)
X+ #define sigpausex(sig) sigpause (sig)
X+ #else
X  #ifndef BSD4_1
X  #define sigfree() sigsetmask (SIGEMPTYMASK)
X  #define sigholdx(sig) sigsetmask (sigmask (sig))
X***************
X*** 220,225 ****
X--- 227,233 ----
X  #define sigunblockx(sig) sigblock (SIGEMPTYMASK)
X  #define sigpausex(sig) sigpause (0)
X  #endif /* not BSD4_1 */
X+ #endif /* USG5_4 */
X  
X  #ifdef BSD4_1
X  #define SIGIO SIGTINT
X***************
X*** 1228,1240 ****
X--- 1236,1256 ----
X        /* if any extra events on the q, send them off now too */
X        while (eqlength) epoch_event_dispatch();
X  #ifdef SIGIO
X+ #ifdef USG5_4
X+       sighold(SIGIO);
X+ #else
X        mask = sigblock (sigmask (SIGIO));
X  #endif
X+ #endif
X        if (kbd_count == 0 && QLength(XD_display))
X  	read_avail_input(0);	/* read it */
X  #ifdef SIGIO
X+ #ifdef USG5_4
X+       sigrelse(SIGIO);
X+ #else
X        sigsetmask (mask);
X  #endif
X+ #endif
X      }
X    input_pending = kbd_count > 0 ;
X    return Qnil;
X***************
X*** 1290,1299 ****
X--- 1306,1324 ----
X      /* It seems there is a timing error such that a SIGIO can be handled here
X         and cause kbd_count to become nonzero even though raising of SIGIO
X         has already been turned off.  */
X+ #ifdef USG5_4
X+     sigset_t omask;
X+     sigprocmask (0, 0, &omask);
X+     sighold (SIGIO);
X+     if (kbd_count == 0)
X+       read_avail_input (*addr);
X+     sigprocmask (SIG_SETMASK, &omask, 0);
X+ #else
X      SIGMASKTYPE mask = sigblock (sigmask (SIGIO));
X      if (kbd_count == 0)
X        read_avail_input (*addr);
X      sigsetmask (mask);
X+ #endif
X    }
X  #else
X    /* If we can't count the input, read it (if any) and see what we got.  */
Xdiff -crN epoch-4.0p1/src/lisp.h epoch/src/lisp.h
X*** epoch-4.0p1/src/lisp.h	Mon Apr 20 11:00:48 1992
X--- epoch/src/lisp.h	Fri May  1 02:07:15 1992
X***************
X*** 262,268 ****
X--- 262,273 ----
X  #define VALMASK ((1<<VALBITS) - 1)
X  #endif
X  #define GCTYPEMASK ((1<<GCTYPEBITS) - 1)
X+ #ifdef __STDC__
X+ /* Need to make sure this deals with unsigneds */
X+ #define MARKBIT ((1U) << (VALBITS + GCTYPEBITS))
X+ #else
X  #define MARKBIT (1 << (VALBITS + GCTYPEBITS))
X+ #endif
X  
X  #endif /* NO_UNION_TYPE */
X  
Xdiff -crN epoch-4.0p1/src/process.c epoch/src/process.c
X*** epoch-4.0p1/src/process.c	Mon Apr 20 11:01:00 1992
X--- epoch/src/process.c	Fri May  1 02:13:02 1992
X***************
X*** 198,203 ****
X--- 198,206 ----
X  extern sys_nerr;
X  extern char *sys_errlist[];
X  
X+ #ifdef SYS_SIGLIST
X+ #define sys_siglist SYS_SIGLIST
X+ #else
X  #ifndef BSD4_1
X  extern char *sys_siglist[];
X  #else
X***************
X*** 231,236 ****
X--- 234,240 ----
X      "exceeded file size limit"
X      };
X  #endif
X+ #endif /* SYS_SIGLIST */
X  
X  #ifdef vipc
X  
X***************
X*** 1261,1267 ****
X  	  }
X  #endif /* not UNIPLUS and not RTU */
X  #ifdef SETUP_SLAVE_PTY
X! 	SETUP_SLAVE_PTY;
X  #endif /* SETUP_SLAVE_PTY */
X  #ifdef AIX
X  	/* On AIX, we've disabled SIGHUP above once we start a child on a pty.
X--- 1265,1273 ----
X  	  }
X  #endif /* not UNIPLUS and not RTU */
X  #ifdef SETUP_SLAVE_PTY
X! 	if (pty_flag) {
X! 	  SETUP_SLAVE_PTY;
X! 	}
X  #endif /* SETUP_SLAVE_PTY */
X  #ifdef AIX
X  	/* On AIX, we've disabled SIGHUP above once we start a child on a pty.
X***************
X*** 1819,1828 ****
X--- 1825,1836 ----
X  	    error("select error: %s", sys_errlist[xerrno]);
X  	}
X  #if defined (sun) || defined (APOLLO)
X+ #ifndef USG5_4
X        else if (nfds > 0 && FD_ISSET (0, &Available) && interrupt_input)
X  	/* System sometimes fails to deliver SIGIO.  */
X  	kill (getpid (), SIGIO);
X  #endif
X+ #endif
X  
X        /* Check for keyboard input */
X        /* If there is any, return immediately
X***************
X*** 2297,2303 ****
X--- 2305,2315 ----
X    /* gid may be a pid, or minus a pgrp's number */
X  #ifdef TIOCSIGSEND
X    if (!NIL (current_group))
X+ #ifdef TIOCSIGNAL	/* SIGSEND is really SIGNAL */
X+     ioctl (XFASTINT (p->infd), TIOCSIGNAL, &signo);
X+ #else
X      ioctl (XFASTINT (p->infd), TIOCSIGSEND, signo);
X+ #endif /* TIOCSIGNAL */
X    else
X      {
X        gid = - XFASTINT (p->pid);
Xdiff -crN epoch-4.0p1/src/screen.c epoch/src/screen.c
X*** epoch-4.0p1/src/screen.c	Mon Apr 20 11:01:05 1992
X--- epoch/src/screen.c	Fri May  1 02:17:10 1992
X***************
X*** 155,161 ****
X  
X    XD_screen.min_width = XD_minibuf.min_width = 4;
X    XD_screen.min_height = 2;
X!   XD_screen.nonlocal_minibuf = 1; /* Default */
X  
X    XD_minibuf.min_height = 1;
X  
X--- 155,161 ----
X  
X    XD_screen.min_width = XD_minibuf.min_width = 4;
X    XD_screen.min_height = 2;
X!   XD_screen.nonlocal_minibuf = 0; /* Default */
X  
X    XD_minibuf.min_height = 1;
X  
Xdiff -crN epoch-4.0p1/src/selection.c epoch/src/selection.c
X*** epoch-4.0p1/src/selection.c	Mon Apr 20 11:01:09 1992
X--- epoch/src/selection.c	Fri May  1 02:24:08 1992
X***************
X*** 334,340 ****
X        XChangeProperty(XD_display,mev.xselection.requestor,
X  		      mev.xselection.property, XA_ATOM,
X  		      32, PropModeReplace, (char *) t, 4);
X-       XFlush(XD_display);
X      }
X    else if (ev->target == XA_length)
X      {
X--- 334,339 ----
X***************
X*** 376,391 ****
X  	  XFlush(XD_display);
X  	}
X      }
X!     else
X!       {
X!         /* Conversion request of other/nonstandard type
X! 	 * Respond with property == None
X! 	 */
X! 	mev.xselection.property = None;
X!       }
X  
X    UNGCPRO;
X  
X    XSendEvent(XD_display,mev.xselection.requestor,False,0,&mev);
X    UNBLOCK_INPUT();
X    
X--- 375,391 ----
X  	  XFlush(XD_display);
X  	}
X      }
X!   else
X!     {
X!       /* Conversion request of other/nonstandard type
X!        * Respond with property == None
X!        */
X!       mev.xselection.property = None;
X!     }
X  
X    UNGCPRO;
X  
X+   BLOCK_INPUT();
X    XSendEvent(XD_display,mev.xselection.requestor,False,0,&mev);
X    UNBLOCK_INPUT();
X    
Xdiff -crN epoch-4.0p1/src/syntax.c epoch/src/syntax.c
X*** epoch-4.0p1/src/syntax.c	Mon Apr 20 11:01:10 1992
X--- epoch/src/syntax.c	Fri May  1 02:07:35 1992
X***************
X*** 113,119 ****
X   into the code it signifies.
X   This is used by modify-syntax-entry, and other things. */
X  
X! char syntax_spec_code[0400] =
X    { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
X      0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
X      0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
X--- 113,119 ----
X   into the code it signifies.
X   This is used by modify-syntax-entry, and other things. */
X  
X! unsigned char syntax_spec_code[0400] =
X    { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
X      0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
X      0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
Xdiff -crN epoch-4.0p1/src/syntax.h epoch/src/syntax.h
X*** epoch-4.0p1/src/syntax.h	Mon Apr 20 11:01:11 1992
X--- epoch/src/syntax.h	Fri May  1 02:07:36 1992
X***************
X*** 86,89 ****
X   character signifies (as a char).  For example,
X   (enum syntaxcode) syntax_spec_code['w'] is Sword. */
X  
X! extern char syntax_spec_code[0400];
X--- 86,89 ----
X   character signifies (as a char).  For example,
X   (enum syntaxcode) syntax_spec_code['w'] is Sword. */
X  
X! extern unsigned char syntax_spec_code[0400];
Xdiff -crN epoch-4.0p1/src/sysdep.c epoch/src/sysdep.c
X*** epoch-4.0p1/src/sysdep.c	Mon Apr 20 11:01:12 1992
X--- epoch/src/sysdep.c	Fri May  1 02:07:38 1992
X***************
X*** 100,105 ****
X--- 100,109 ----
X  #endif
X  #ifdef USG
X  #include <fcntl.h>
X+ #ifdef USG5_4
X+ #undef FASYNC
X+ #include <sys/filio.h>
X+ #endif /* USG5_4 */
X  #endif
X  #endif /* not 4.1 bsd */
X  
X***************
X*** 113,121 ****
X  #ifdef BSD4_1
X  #include <wait.h>
X  #else /* not 4.1 */
X- #ifndef USG5_4
X  #include <sys/wait.h>
X- #endif /* USG 5.4 */
X  #endif /* not 4.1 */
X  #endif /* BSD */
X  
X--- 117,123 ----
X***************
X*** 834,840 ****
X  }
X  
X  #else /* no FASYNC */
X! #ifdef STRIDE		/* Stride doesn't have FASYNC - use FIOASYNC */
X  
X  request_sigio ()
X  {
X--- 836,842 ----
X  }
X  
X  #else /* no FASYNC */
X! #if defined(STRIDE) || defined(SUNOS_5)	/* Stride doesn't have FASYNC - use FIOASYNC */
X  
X  request_sigio ()
X  {
X***************
X*** 1645,1653 ****
X--- 1647,1660 ----
X  #ifdef DATA_START
X    return ((char *) DATA_START);
X  #else
X+ #ifdef USG5_4
X+   extern etext;
X+   return &etext;
X+ #else
X    extern int data_start;
X    return ((char *) &data_start);
X  #endif
X+ #endif
X  }
X  #endif /* NEED_STARTS (not CANNOT_DUMP or not SYSTEM_MALLOC) */
X  
X***************
X*** 2417,2422 ****
X--- 2424,2430 ----
X   *	always negligible.   Fred Fish, Unisoft Systems Inc.
X   */
X  
X+ #ifndef SYS_SIGLIST
X  char *sys_siglist[NSIG + 1] =
X  {
X  #ifdef AIX
X***************
X*** 2477,2482 ****
X--- 2485,2491 ----
X  #endif /* not AIX */
X    0
X    };
X+ #endif /* SYS_SIGLIST */
X  
X  /*
X   *	Warning, this function may not duplicate 4.2 action properly
Xdiff -crN epoch-4.0p1/src/x11term.c epoch/src/x11term.c
X*** epoch-4.0p1/src/x11term.c	Mon Apr 20 11:01:34 1992
X--- epoch/src/x11term.c	Fri May  1 02:07:52 1992
X***************
X*** 120,127 ****
X--- 120,132 ----
X  #define MAPPINGBUFLEN 256
X  extern int errno;
X  
X+ #ifdef USG5_4
X+ #define sigunblockx(sig) sigrelse(sig)
X+ #define sigblockx(sig) sighold(sig)
X+ #else
X  #define sigunblockx(sig) sigblock (SIGEMPTYMASK)
X  #define sigblockx(sig) sigblock (sigmask ((sig)))
X+ #endif
X  
X  #define METABIT 0200
X  #define MINWIDTH 12	/* In pixels */
X***************
X*** 1585,1591 ****
X--- 1590,1607 ----
X                                   * it is a genuine lvalue
X  				 */
X  #endif  
X+ 
X+ #ifdef USG
X+ #ifdef USG5_4
X+ 	/* In USG5.4 we want a new process group, but not a new session.
X+ 	   */
X+ 	setpgid (0, 0);
X+ #else
X+ 	setpgrp ();		/* No arguments but equivalent in this case */
X+ #endif /* USG5_4 */
X+ #else
X    setpgrp (0,getpid());
X+ #endif /* USG */
X  	
X  #ifdef F_SETOWN
X    old_fcntl_owner = fcntl (0, F_GETOWN, 0);
Xdiff -crN epoch-4.0p1/src/x11term.h epoch/src/x11term.h
X*** epoch-4.0p1/src/x11term.h	Mon Apr 20 11:01:35 1992
X--- epoch/src/x11term.h	Fri May  1 02:07:53 1992
X***************
X*** 16,23 ****
X--- 16,28 ----
X  
X  #define BLOCK_INPUT_DECLARE() SIGMASKTYPE BLOCK_INPUT_mask
X  #ifdef SIGIO
X+ #ifdef USG5_4
X+ #define BLOCK_INPUT()	sighold(SIGIO)
X+ #define UNBLOCK_INPUT()	sigrelse(SIGIO)
X+ #else
X  #define BLOCK_INPUT() BLOCK_INPUT_mask = sigblock (sigmask (SIGIO))
X  #define UNBLOCK_INPUT() sigsetmask (BLOCK_INPUT_mask)
X+ #endif /* USG5_4 */
X  #else /* not SIGIO */
X  #define BLOCK_INPUT() stop_polling ()
X  #define UNBLOCK_INPUT() start_polling ()
Xdiff -crN epoch-4.0p1/src/xd.h epoch/src/xd.h
X*** epoch-4.0p1/src/xd.h	Mon Apr 20 11:01:36 1992
X--- epoch/src/xd.h	Fri May  1 02:07:53 1992
X***************
X*** 90,96 ****
X  	   ".screen.update", ".Screen.Update" },
X  	{  (VOID *)&XD_screen.motion_hints, XDT_BoolF,
X  	   ".screen.motion", ".Screen.Motion" },
X! 	{  (VOID *)&XD_screen.nonlocal_minibuf, XDT_BoolT,
X  	   ".nonlocal.minibuf", ".Nonlocal.Minibuf" }
X      };
X  #define xdef_size	(sizeof(xdef)/sizeof(struct XDefaultEntry))
X--- 90,96 ----
X  	   ".screen.update", ".Screen.Update" },
X  	{  (VOID *)&XD_screen.motion_hints, XDT_BoolF,
X  	   ".screen.motion", ".Screen.Motion" },
X! 	{  (VOID *)&XD_screen.nonlocal_minibuf, XDT_BoolF,
X  	   ".nonlocal.minibuf", ".Nonlocal.Minibuf" }
X      };
X  #define xdef_size	(sizeof(xdef)/sizeof(struct XDefaultEntry))
Xdiff -crN epoch-4.0p1/src/ymakefile epoch/src/ymakefile
X*** epoch-4.0p1/src/ymakefile	Mon Apr 20 11:01:43 1992
X--- epoch/src/ymakefile	Thu Apr 23 20:47:27 1992
X***************
X*** 164,169 ****
X--- 164,171 ----
X  /* LOCALCPP is the local one or nothing.
X     CPP is the local one or the standardone.  */
X  LOCALCPP= localcpp
X+ #else
X+ LOCALCPP=
X  #endif /* NEED_CPP */
X  
X  #ifdef SHORTNAMES
X***************
X*** 170,176 ****
X  SHORT= shortnames
X  #endif /* SHORTNAMES */
X  
X! CFLAGS= C_DEBUG_SWITCH -Demacs $(MYCPPFLAG) C_SWITCH_MACHINE C_SWITCH_SYSTEM
X  /* DO NOT use -R.  There is a special hack described in lastfile.c
X     which is used instead.  Some initialized data areas are modified
X     at initial startup, then labeled as part of the text area when
X--- 172,178 ----
X  SHORT= shortnames
X  #endif /* SHORTNAMES */
X  
X! CFLAGS= C_OPTIMIZE_SWITCH -Demacs $(MYCPPFLAG) C_SWITCH_MACHINE C_SWITCH_SYSTEM
X  /* DO NOT use -R.  There is a special hack described in lastfile.c
X     which is used instead.  Some initialized data areas are modified
X     at initial startup, then labeled as part of the text area when
END_OF_epoch-4.0p2.solaris-2.0.patch
if test 34990 -ne `wc -c <epoch-4.0p2.solaris-2.0.patch`; then
    echo shar: \"epoch-4.0p2.solaris-2.0.patch\" unpacked with wrong size!
fi
# end of overwriting check
fi
echo shar: End of shell archive.
exit 0