From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 May 2010 03:03:14 +0000 (-0700)
Subject: * s/gnu-linux.h: Combine two conditionals.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9539dc5db33befba5aaed2bfa9e38d67a599d9f5;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a649d56815..f271c52907c 100644
--- 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 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/>.  */
 /* 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 */