diff options
| author | Dan Nicolaescu | 2010-04-23 00:00:38 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-04-23 00:00:38 -0700 |
| commit | feeb1604f50bafb987b4e85ac3df5edef5151662 (patch) | |
| tree | fec87f88e822ecec11784c639923d31b241f0b95 /src/s | |
| parent | d8004abee409ddbda6875bdd3e99bbf1a96e8b9d (diff) | |
| download | emacs-feeb1604f50bafb987b4e85ac3df5edef5151662.tar.gz emacs-feeb1604f50bafb987b4e85ac3df5edef5151662.zip | |
Clean up Solaris code.
* s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS, C_SWITCH_X_SYSTEM)
(LIB_MOTIF): Remove, configure takes care of this.
(NOT_USING_MOTIF): Remove, unused.
* xrdb.c: Remove #if 0-ed #include.
(SYSV): Remove conditional for old SysV.
* sysdep.c (closedir): Remove conditional code for Solaris,
Solaris has closedir.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/sol2-6.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h index 408a0a2ed02..5ca5cfbc0d0 100644 --- a/src/s/sol2-6.h +++ b/src/s/sol2-6.h | |||
| @@ -73,35 +73,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 73 | pty_name[sizeof (pty_name) - 1] = 0; \ | 73 | pty_name[sizeof (pty_name) - 1] = 0; \ |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | /* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. | ||
| 77 | Instead, dynamically check whether USE_MOTIF expands to something. */ | ||
| 78 | #define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; } | ||
| 79 | |||
| 80 | #ifndef __GNUC__ | ||
| 81 | #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \ | ||
| 82 | `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'` | ||
| 83 | #else /* GCC */ | ||
| 84 | /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX | ||
| 85 | has anything in it. It can be empty. | ||
| 86 | This works ok in temacs. */ | ||
| 87 | #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ | ||
| 88 | `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ | ||
| 89 | `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` | ||
| 90 | |||
| 91 | /* Get rid of -traditional and let const really do its thing. */ | ||
| 92 | #undef C_SWITCH_SYSTEM | ||
| 93 | #undef const | ||
| 94 | #endif /* GCC */ | ||
| 95 | |||
| 96 | /* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files | ||
| 97 | are in this directory on Solaris 2.4. */ | ||
| 98 | #define C_SWITCH_X_SYSTEM -I/usr/dt/include | ||
| 99 | |||
| 100 | /* -lgen is needed for the regex and regcmp functions | ||
| 101 | which are used by Motif. In the future we can try changing | ||
| 102 | regex.c to provide them in Emacs, but this is safer for now. */ | ||
| 103 | #define LIB_MOTIF -lXm -lgen | ||
| 104 | |||
| 105 | /* This is the only known way to avoid some crashes | 76 | /* This is the only known way to avoid some crashes |
| 106 | that seem to relate to screwed up malloc data | 77 | that seem to relate to screwed up malloc data |
| 107 | after deleting a frame. */ | 78 | after deleting a frame. */ |