aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2002-02-02 23:05:59 +0000
committerAndreas Schwab2002-02-02 23:05:59 +0000
commitee466d0b94320d5041dd34a2659d93c5c900ee3a (patch)
tree929b25e532bf80453cad8d3c35131f1195038f98 /src
parentf77157da4181e2ec96a18e8059b40b1b2312d477 (diff)
downloademacs-ee466d0b94320d5041dd34a2659d93c5c900ee3a.tar.gz
emacs-ee466d0b94320d5041dd34a2659d93c5c900ee3a.zip
Check for __mc68000__ instead of __m68k__, the latter never being defined
on GNU/Linux.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/s/gnu-linux.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 40e9c51caf5..ca75452db36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12002-02-03 Andreas Schwab <schwab@suse.de>
2
3 * s/gnu-linux.h: Check for __mc68000__ instead of __m68k__, the
4 latter never being defined on GNU/Linux.
5
12002-02-02 Eli Zaretskii <eliz@is.elta.co.il> 62002-02-02 Eli Zaretskii <eliz@is.elta.co.il>
2 7
3 * xfaces.c (realize_default_face): Don't set the weight and slant 8 * xfaces.c (realize_default_face): Don't set the weight and slant
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3623fd7e702..3a7c05eee34 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -338,7 +338,7 @@ Boston, MA 02111-1307, USA. */
338/* Don't use #cpu here since in newest development versions of GCC, 338/* Don't use #cpu here since in newest development versions of GCC,
339 we must call cpp with -traditional, and that disables #cpu. */ 339 we must call cpp with -traditional, and that disables #cpu. */
340 340
341#if defined __i386__ || defined __sparc__ || defined __m68k__ || defined __alpha__ 341#if defined __i386__ || defined __sparc__ || defined __mc68000__ || defined __alpha__
342#define GC_SETJMP_WORKS 1 342#define GC_SETJMP_WORKS 1
343#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS 343#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
344#endif 344#endif