diff options
| author | Jim Blandy <jimb@redhat.com> | 1992-05-01 06:20:52 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1992-05-01 06:20:52 +0000 |
| commit | 784e43dd34233d2fcb828f86fa8fa01ad209517b (patch) | |
| tree | 2f006fc75e7429e60eac245b9e277486a08d06c7 | |
| parent | 32676c085ce177af1e1e8ab61360c68772450af0 (diff) | |
| download | emacs-784e43dd34233d2fcb828f86fa8fa01ad209517b.tar.gz | |
entered into RCS
| -rwxr-xr-x | build-ins.in | 3 | ||||
| -rw-r--r-- | src/epaths.in | 4 | ||||
| -rw-r--r-- | src/s/hpux.h | 2 | ||||
| -rw-r--r-- | src/s/sunos4shr.h | 2 | ||||
| -rw-r--r-- | src/x11term.h | 7 |
5 files changed, 7 insertions, 11 deletions
diff --git a/build-ins.in b/build-ins.in index 0769f528ef0..872422f7645 100755 --- a/build-ins.in +++ b/build-ins.in @@ -82,8 +82,7 @@ dumplisppath=`echo ${dumplisppath} | ${removenullpaths}` ; \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${dumplisppath}'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${libdir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${datadir}";' \ --e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";' \ --e 's;\(#.*PATH_SUPERLOCK\).*$$;\1 "${lockdir}/!!!SuperLock!!!";' +-e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";' (cd lib-src; make) || exit 1 (cd src; make) || exit 1 diff --git a/src/epaths.in b/src/epaths.in index 7d92875bd88..ed15aca17ac 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -27,7 +27,3 @@ should be writable by everyone. THE STRING MUST END WITH A SLASH!!! */ #define PATH_LOCK "/usr/local/lib/emacs/lock/" - -/* the name of the file !!!SuperLock!!! in the directory - specified by PATH_LOCK. Yes, this is redundant. */ -#define PATH_SUPERLOCK "/usr/local/lib/emacs/lock/!!!SuperLock!!!" diff --git a/src/s/hpux.h b/src/s/hpux.h index e146501004c..945835982a8 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -199,7 +199,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define srand srand48 /* In hpux, the symbol SIGIO is defined, but the feature - does not really exist. + doesn't work in the way Emacs needs it to. Here we assume that signal.h is included before config.h so that we can override it here. */ diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h index 2b665513b19..c5bcf838e61 100644 --- a/src/s/sunos4shr.h +++ b/src/s/sunos4shr.h @@ -27,4 +27,4 @@ #define UNEXEC unexsunos4.o #define RUN_TIME_REMAP -#define LD_CMD cc +#define LINKER cc diff --git a/src/x11term.h b/src/x11term.h index c6f24ba91eb..367eeaacc95 100644 --- a/src/x11term.h +++ b/src/x11term.h @@ -13,11 +13,12 @@ #define BLOCK_INPUT_DECLARE() int BLOCK_INPUT_mask #ifdef SIGIO -#define BLOCK_INPUT() BLOCK_INPUT_mask = sigblock (sigmask (SIGIO)) -#define UNBLOCK_INPUT() sigsetmask (BLOCK_INPUT_mask) +#define BLOCK_INPUT() EMACS_SIGBLOCKX (SIGIO, BLOCK_INPUT_mask) +#define UNBLOCK_INPUT() \ + do { int _dummy; EMACS_SIGSETMASK (BLOCK_INPUT_mask, _dummy); } while (0) #else /* not SIGIO */ #define BLOCK_INPUT() #define UNBLOCK_INPUT() #endif /* SIGIO */ -#define CLASS "emacs" /* class id for GNU Emacs, used in .Xdefaults, etc. */ +#define CLASS "Emacs" /* class id for GNU Emacs, used in .Xdefaults, etc. */ |