diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-17 14:09:13 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-17 14:09:13 +0000 |
| commit | 35ad054578a15b8f98b7d7e93f03d2f9cd112c3e (patch) | |
| tree | 9d5bf976f170893bab62f80c30ba71d17f95f147 | |
| parent | 2749d28e1bd80262749657ee4a60e5b1f75b6cb8 (diff) | |
| download | emacs-35ad054578a15b8f98b7d7e93f03d2f9cd112c3e.tar.gz | |
* s/sol2.h:
* s/sol2-4.h: Reorganize conditionals.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/sol2-4.h | 11 | ||||
| -rw-r--r-- | src/s/sol2.h | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a82e5c62968..e540db8d607 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h index 3cf2786c500..df8552e9562 100644 --- a/src/s/sol2-4.h +++ b/src/s/sol2-4.h @@ -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 diff --git a/src/s/sol2.h b/src/s/sol2.h index aa30be3675c..1938fb6d865 100644 --- a/src/s/sol2.h +++ b/src/s/sol2.h @@ -31,6 +31,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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. */ |