From feeb1604f50bafb987b4e85ac3df5edef5151662 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 23 Apr 2010 00:00:38 -0700 Subject: [PATCH] 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. --- src/ChangeLog | 11 +++++++++++ src/s/sol2-6.h | 29 ----------------------------- src/sysdep.c | 7 ------- src/xrdb.c | 16 ---------------- 4 files changed, 11 insertions(+), 52 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6588549e496..6797b623db2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2010-04-23 Dan Nicolaescu + + 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 * xsettings.c (read_and_apply_settings): Check if current_font is 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 . */ 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 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. */ diff --git a/src/sysdep.c b/src/sysdep.c index 506af23ef30..aebf6e7a2d1 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -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 */ -#endif xfree ((char *) dirp); return rtnval; diff --git a/src/xrdb.c b/src/xrdb.c index 7808bacc59f..bd3474c0466 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -34,24 +34,8 @@ along with GNU Emacs. If not, see . */ #include #include -#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 #include -#if 0 -#include -#endif #include #include #include -- 2.39.5