diff options
| author | Steven Tamm <[email protected]> | 2004-04-26 18:44:22 +0000 |
|---|---|---|
| committer | Steven Tamm <[email protected]> | 2004-04-26 18:44:22 +0000 |
| commit | 536d6baa1d78235e4aeb3283d271d9c7a6812638 (patch) | |
| tree | 169df5f52e0916995cb26d420edbf84c73879724 /src | |
| parent | 3a69e5ad811a524da769c3a207750bb8d7d499d6 (diff) | |
lread.c (init_lread): Fixing typo HAVE_CARBON test logic
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lread.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1dfd8dc97c..28edb250a3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Steven Tamm <[email protected]> + + * lread.c (init_lread): Fixing typo HAVE_CARBON test logic + 2004-04-26 Miles Bader <[email protected]> * lisp.h (CYCLE_CHECK): Macro moved from xfaces.c. diff --git a/src/lread.c b/src/lread.c index 66ac69912b..0910dda61c 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. */ |