From: Steven Tamm <steventamm@mac.com>
Date: Mon, 26 Apr 2004 18:44:22 +0000 (+0000)
Subject: lread.c (init_lread): Fixing typo HAVE_CARBON test logic
X-Git-Tag: ttn-vms-21-2-B4~6594
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=536d6baa1d78235e4aeb3283d271d9c7a6812638;p=emacs.git

lread.c (init_lread): Fixing typo HAVE_CARBON test logic
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1dfd8dc97c9..28edb250a39 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
+
+	* lread.c (init_lread): Fixing typo HAVE_CARBON test logic
+
 2004-04-26  Miles Bader  <miles@gnu.org>
 
 	* lisp.h (CYCLE_CHECK): Macro moved from xfaces.c.
diff --git a/src/lread.c b/src/lread.c
index 66ac69912b7..0910dda61cd 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3676,7 +3676,7 @@ init_lread ()
     }
 #endif
 
-#if (!(defined(WINDOWSNT) && (defined(HAVE_CARBON)) ))
+#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON))))
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
      almost never correct, thereby causing a warning to be printed out that
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
@@ -3706,7 +3706,7 @@ init_lread ()
 	    }
 	}
     }
-#endif /* WINDOWSNT && HAVE_CARBON*/
+#endif /* !(WINDOWSNT || HAVE_CARBON) */
 
   /* If the EMACSLOADPATH environment variable is set, use its value.
      This doesn't apply if we're dumping.  */