* s/gnu-linux.h: Combine two conditionals.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a649d568150f08920b0bdc01b41416852dae1e6..f271c52907c89cd52b62163afe560564b8117928 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index c062f855276910b1bd581e226aa98b423d73119d..674f00f1d09cb6f8ac1a13803f1412d53b951a12 100644 (file)
--- 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/>.  */
 /* 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,11 +125,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_pptr - (FILE)->_pbase)
 #endif /* !_IO_STDIO_H && ! __UCLIBC__ */
-#endif /* emacs */
 
-#ifdef emacs
 #define INTERRUPT_INPUT
-#endif
+#endif /* emacs */
 
 #define SYSV_SYSTEM_DIR       /* use dirent.h */