mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-22 05:51:11 -07:00
Code Issues Projects Releases Wiki Activity

Clean up Solaris code.

Browse source 
* 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.
This commit is contained in:
Dan Nicolaescu 2010-04-23 00:00:38 -07:00
parent d8004abee4
commit feeb1604f5
4 changed files with 11 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ChangeLog
View file

@ -1,3 +1,14 @@
2010-04-23 Dan Nicolaescu <dann@ics.uci.edu>
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.
2010-04-22 Jan Djärv <jan.h.d@swipnet.se>
* xsettings.c (read_and_apply_settings): Check if current_font is

29
src/s/sol2-6.h
View file

@ -73,35 +73,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
pty_name[sizeof (pty_name) - 1] = 0; \
}
/* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet.
Instead, dynamically check whether USE_MOTIF expands to something. */
#define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; }
#ifndef __GNUC__
#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib'`
#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.
This works ok in temacs. */
#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
are in this directory on Solaris 2.4. */
#define C_SWITCH_X_SYSTEM -I/usr/dt/include
/* -lgen is needed for the regex and regcmp functions
which are used by Motif. In the future we can try changing
regex.c to provide them in Emacs, but this is safer for now. */
#define LIB_MOTIF -lXm -lgen
/* This is the only known way to avoid some crashes
that seem to relate to screwed up malloc data
after deleting a frame. */

7
src/sysdep.c
View file

@ -2709,13 +2709,6 @@ closedir (DIR *dirp /* stream from opendir */)
int rtnval;
rtnval = emacs_close (dirp->dd_fd);
/* Some systems (like Solaris) allocate the buffer and the DIR all
in one block. Why in the world are we freeing this ourselves
anyway? */
#if ! defined (SOLARIS2)
xfree ((char *) dirp->dd_buf); /* directory block defined in <dirent.h> */
#endif
xfree ((char *) dirp);
return rtnval;

16
src/xrdb.c
View file

@ -34,24 +34,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include <setjmp.h>
#if 1 /* I'd really appreciate it if this code could go away... -JimB */
/* This avoids lossage in the `dual-universe' headers on AT&T SysV
X11. Don't do it on Solaris, because it breaks compilation with
XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris
2 */
#if defined(USG5) && !defined(SOLARIS2)
#ifndef SYSV
#define SYSV
#endif
#endif /* USG5 && !SOLARIS2 */
#endif /* 1 */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#if 0
#include <X11/Xos.h>
#endif
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>