diff src/s/sol2-3.h @ 96837:f8fd21534848

* s/sol2-3.h: Insert contents of s/sol2.h. (LD_SWITCH_SYSTEM): Remove redundant definition. * s/sol2.h: Remove, unused.

--- a/src/s/sol2-3.h	Sun Jul 20 14:12:41 2008 +0000
+++ b/src/s/sol2-3.h	Sun Jul 20 14:14:52 2008 +0000
@@ -18,15 +18,42 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "usg5-4.h"
 
-#include "sol2.h"
+#define SOLARIS2
+
+/* This triggers a conditional in xfaces.c.  */
+#define XOS_NEEDS_TIME_H
+
+#define POSIX
+
+#define LIBS_SYSTEM -lsocket -lnsl -lkstat
 
-/* Override LD_SWITCH_SYSTEM: add  -L /usr/ccs/lib to the sol2.h value.  */
+/* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
+   [e-mail], 7/21/97.  Don't redefine if already defined
+   (e.g., by config.h). */
+#ifndef HAVE_LIBKSTAT
+#define HAVE_LIBKSTAT
+#endif
+
+/* [e-mail] says Solaris has a bug related to X11R6-style
+   XIM support.  */
 
-#undef LD_SWITCH_SYSTEM
+#define INHIBIT_X11R6_XIM
+
+/* Must use the system's termcap, if we use any termcap.
+   It does special things.  */
+
+#ifndef TERMINFO
+#define LIBS_TERMCAP -ltermcap
+#endif
+
+#define USE_MMAP_FOR_BUFFERS 1
 
 #ifndef __GNUC__
 #define LD_SWITCH_SYSTEM -L /usr/ccs/lib 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.
@@ -38,7 +65,7 @@
 /* Info from [e-mail] suggests this is appropriate.  */
 #define POSIX_SIGNALS
 
-/* We don't need the definition from usg5-3.h with POSIX_SIGNALS.  */
+/* We don't need the definition from usg5-4.h with POSIX_SIGNALS.  */
 #undef sigsetmask
 
 /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock