Mercurial > emacs
changeset 108640:0b7cdd98b42f
* s/gnu-linux.h: Combine two conditionals.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 17 May 2010 20:03:14 -0700 |
| parents | cfaca963d899 |
| children | c8d754c15c55 |
| files | src/ChangeLog src/s/gnu-linux.h |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon May 17 19:59:15 2010 -0700 +++ b/src/ChangeLog Mon May 17 20:03:14 2010 -0700 @@ -1,6 +1,8 @@ 2010-05-18 Glenn Morris <rgm@gnu.org> - * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) seperately from + * s/gnu-linux.h: Combine two conditionals. + + * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from $(POST_ALLOC_OBJ). * Makefile.in (RALLOC_OBJ): New, set by configure.
--- a/src/s/gnu-linux.h Mon May 17 19:59:15 2010 -0700 +++ b/src/s/gnu-linux.h Mon May 17 20:03:14 2010 -0700 @@ -97,7 +97,6 @@ /* This is used in list_system_processes. */ #define HAVE_PROCFS 1 - /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ @@ -126,12 +125,10 @@ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->_pptr - (FILE)->_pbase) #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ + +#define INTERRUPT_INPUT #endif /* emacs */ -#ifdef emacs -#define INTERRUPT_INPUT -#endif - #define SYSV_SYSTEM_DIR /* use dirent.h */ #define POSIX /* affects getpagesize.h and systty.h */