Mercurial > emacs

--- a/src/ChangeLog	Thu Apr 22 22:43:48 2010 -0700
+++ b/src/ChangeLog	Fri Apr 23 00:00:38 2010 -0700
@@ -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
--- a/src/s/sol2-6.h	Thu Apr 22 22:43:48 2010 -0700
+++ b/src/s/sol2-6.h	Fri Apr 23 00:00:38 2010 -0700
@@ -73,35 +73,6 @@
     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.  */
--- a/src/sysdep.c	Thu Apr 22 22:43:48 2010 -0700
+++ b/src/sysdep.c	Fri Apr 23 00:00:38 2010 -0700
@@ -2709,13 +2709,6 @@
   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;
--- a/src/xrdb.c	Thu Apr 22 22:43:48 2010 -0700
+++ b/src/xrdb.c	Fri Apr 23 00:00:38 2010 -0700
@@ -34,24 +34,8 @@
 #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>