Test GNU_LINUX, not LINUX.

diff --git a/src/Makefile.in b/src/Makefile.in
index 04655d4..1687c58 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -109,7 +109,7 @@ CC = C_COMPILER
 /* GNU libc requires ORDINARY_LINK so that its own crt0 is used.
    Linux is an exception because it uses a funny variant of GNU libc.  */
 #ifdef __GNU_LIBRARY__
-#ifndef LINUX
+#ifndef GNU_LINUX
 #define ORDINARY_LINK
 #endif
 #endif

diff --git a/src/dispnew.c b/src/dispnew.c
index da6bcc3..c5ce42e 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif /* not __GNU_LIBRARY__ */
 
-#if defined(HAVE_TERM_H) && defined (LINUX) && defined (HAVE_LIBNCURSES)
+#if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
 #include <term.h>              /* for tgetent */
 #endif
 \f
@@ -6397,7 +6397,7 @@ init_display ()
 #else
       Vwindow_system_version = make_number (10);
 #endif
-#if defined (LINUX) && defined (HAVE_LIBNCURSES)
+#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
       /* In some versions of ncurses,
         tputs crashes if we have not called tgetent.
         So call tgetent.  */

diff --git a/src/emacs.c b/src/emacs.c
index 2262194..bf7f9a5 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -593,7 +593,7 @@ void __do_global_ctors_aux ()
 void __do_global_dtors ()
 {}
 /* Linux has a bug in its library; avoid an error.  */
-#ifndef LINUX
+#ifndef GNU_LINUX
 char * __CTOR_LIST__[2] = { (char *) (-1), 0 };
 #endif
 char * __DTOR_LIST__[2] = { (char *) (-1), 0 };

diff --git a/src/fileio.c b/src/fileio.c
index 407109d..69a7ec8 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 
-#if defined (USG5) || defined (BSD_SYSTEM) || defined (LINUX)
+#if defined (USG5) || defined (BSD_SYSTEM) || defined (GNU_LINUX)
 #include <fcntl.h>
 #endif
 

diff --git a/src/mem-limits.h b/src/mem-limits.h
index dae4cf7..1028d7f 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -118,7 +118,7 @@ get_lim_data ()
   lim_data = -1;
 
   /* Use the ulimit call, if we seem to have it.  */
-#if !defined (ULIMIT_BREAK_VALUE) || defined (LINUX)
+#if !defined (ULIMIT_BREAK_VALUE) || defined (GNU_LINUX)
   lim_data = ulimit (3, 0);
 #endif
 

diff --git a/src/process.c b/src/process.c
index 5d57914..e9f7c59 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -4276,7 +4276,7 @@ sigchld_handler (signo)
         Otherwise (on systems that have WNOHANG), loop around
         to use up all the processes that have something to tell us.  */
 #if (defined WINDOWSNT \
-     || (defined USG && !defined LINUX \
+     || (defined USG && !defined GNU_LINUX \
          && !(defined HPUX && defined WNOHANG)))
 #if defined (USG) && ! defined (POSIX_SIGNALS)
       signal (signo, sigchld_handler);

diff --git a/src/sysdep.c b/src/sysdep.c
index 28de7db..6d0528c 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -245,7 +245,7 @@ static int baud_convert[] =
 #else
 #if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
 #else
-#if defined (HAVE_TERMIOS_H) && defined (LINUX)
+#if defined (HAVE_TERMIOS_H) && defined (GNU_LINUX)
 #include <termios.h>
 #endif
 #endif
@@ -476,7 +476,7 @@ wait_for_termination (pid)
        break;
       wait (0);
 #else /* neither BSD_SYSTEM nor UNIPLUS: random sysV */
-#ifdef POSIX_SIGNALS    /* would this work for LINUX as well? */
+#ifdef POSIX_SIGNALS    /* would this work for GNU/Linux as well? */
       sigblock (sigmask (SIGCHLD));
       errno = 0;
       if (kill (pid, 0) == -1 && errno == ESRCH)