Mercurial > emacs
changeset 96765:8b34dc6bbff5
* s/sol2.h:
* s/sol2-4.h: Reorganize conditionals.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 17 Jul 2008 14:09:13 +0000 |
| parents | 1307c33f5e9a |
| children | 19a21a87b52a |
| files | src/ChangeLog src/s/sol2-4.h src/s/sol2.h |
| diffstat | 3 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 17 13:57:13 2008 +0000 +++ b/src/ChangeLog Thu Jul 17 14:09:13 2008 +0000 @@ -1,5 +1,8 @@ 2008-07-17 Dan Nicolaescu <dann@ics.uci.edu> + * s/sol2.h: + * s/sol2-4.h: Reorganize conditionals. + * ecrt0.c: Remove code depending on m68000, not used anymore. * fns.c (hash_remove): Make static.
--- a/src/s/sol2-4.h Thu Jul 17 13:57:13 2008 +0000 +++ b/src/s/sol2-4.h Thu Jul 17 14:09:13 2008 +0000 @@ -2,13 +2,6 @@ #include "sol2-3.h" -/* Get rid of -traditional and let const really do its thing. */ - -#ifdef __GNUC__ -#undef C_SWITCH_SYSTEM -#undef const -#endif /* __GNUC__ */ - #undef LD_SWITCH_SYSTEM /* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. @@ -25,6 +18,10 @@ #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` + +/* Get rid of -traditional and let const really do its thing. */ +#undef C_SWITCH_SYSTEM +#undef const #endif /* GCC */ /* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files
--- a/src/s/sol2.h Thu Jul 17 13:57:13 2008 +0000 +++ b/src/s/sol2.h Thu Jul 17 14:09:13 2008 +0000 @@ -31,6 +31,8 @@ says where to find X windows at run time. */ #ifndef __GNUC__ #define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX +/* eggert thinks all versions of SunPro C allowed this. */ +#define C_DEBUG_SWITCH -g -O #else /* GCC */ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX has anything in it. It can be empty. @@ -48,11 +50,6 @@ #define HAVE_LIBKSTAT #endif -/* eggert thinks all versions of SunPro C allowed this. */ -#ifndef __GNUC__ -#define C_DEBUG_SWITCH -g -O -#endif - /* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style XIM support. */