diff options
| author | Glenn Morris | 2010-05-17 20:03:14 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-17 20:03:14 -0700 |
| commit | 9539dc5db33befba5aaed2bfa9e38d67a599d9f5 (patch) | |
| tree | c838f463317cb2f3b67a677103ee013cd5b74ca0 /src/s/gnu-linux.h | |
| parent | 7b570c766f1125f96c095a75cb90ca26f264a377 (diff) | |
| download | emacs-9539dc5db33befba5aaed2bfa9e38d67a599d9f5.tar.gz emacs-9539dc5db33befba5aaed2bfa9e38d67a599d9f5.zip | |
* s/gnu-linux.h: Combine two conditionals.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index c062f855276..674f00f1d09 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -97,7 +97,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 97 | /* This is used in list_system_processes. */ | 97 | /* This is used in list_system_processes. */ |
| 98 | #define HAVE_PROCFS 1 | 98 | #define HAVE_PROCFS 1 |
| 99 | 99 | ||
| 100 | |||
| 101 | /* Define CLASH_DETECTION if you want lock files to be written | 100 | /* Define CLASH_DETECTION if you want lock files to be written |
| 102 | so that Emacs can tell instantly when you try to modify | 101 | so that Emacs can tell instantly when you try to modify |
| 103 | a file that someone else has modified in his Emacs. */ | 102 | a file that someone else has modified in his Emacs. */ |
| @@ -126,11 +125,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 126 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ | 125 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ |
| 127 | ((FILE)->_pptr - (FILE)->_pbase) | 126 | ((FILE)->_pptr - (FILE)->_pbase) |
| 128 | #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ | 127 | #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ |
| 129 | #endif /* emacs */ | ||
| 130 | 128 | ||
| 131 | #ifdef emacs | ||
| 132 | #define INTERRUPT_INPUT | 129 | #define INTERRUPT_INPUT |
| 133 | #endif | 130 | #endif /* emacs */ |
| 134 | 131 | ||
| 135 | #define SYSV_SYSTEM_DIR /* use dirent.h */ | 132 | #define SYSV_SYSTEM_DIR /* use dirent.h */ |
| 136 | 133 | ||