[Emacs-diffs] /srv/bzr/emacs/trunk r100341: * s/gnu-linux.h: Combine two conditionals.

[Glenn Morris]

------------------------------------------------------------
revno: 100341
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-17 20:03:14 -0700
message:
  * s/gnu-linux.h: Combine two conditionals.
modified:
  src/ChangeLog
  src/s/gnu-linux.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-18 02:49:28 +0000
+++ b/src/ChangeLog     2010-05-18 03:03:14 +0000
@@ -1,6 +1,8 @@
 2010-05-18  Glenn Morris  <address@hidden>
 
-       * 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.

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2010-05-18 02:44:07 +0000
+++ b/src/s/gnu-linux.h 2010-05-18 03:03:14 +0000
@@ -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,11 +125,9 @@
 #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 */