--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/s/sol2.h	Mon Aug 13 08:45:50 2007 +0200
@@ -0,0 +1,104 @@
+/* Synched up with: FSF 19.31. */
+
+#include "usg5-4-2.h"		/* XEmacs change from 5-4 to 5-4-2 */
+
+#define SOLARIS2
+
+/* SIGIO seems to be working under Solaris and it makes ^G work better... */
+#undef BROKEN_SIGIO
+
+/* eggert@twinsun.com said these work in Solaris.
+   Perhaps they work in all kinds of SVR4, but this is more conservative.  */
+#undef BROKEN_TIOCGETC
+#undef BROKEN_TIOCGWINSZ
+
+/* This triggers a conditional in xfaces.c.  */
+#define XOS_NEEDS_TIME_H
+
+#define POSIX
+
+/* FSF uses LD_SWITCH_X_SITE_AUX in the following definitions to deal with
+   the -R flags.  While the intention is good, it doesn't seem to work that
+   well -- Solaris is just too damn screwy.  So we go ahead and let
+   configure have special checks for Solaris. */
+
+/* Here is how to find X Windows.  The -R option says where
+   to find X windows at run time.  */
+#ifdef __GNUC__
+#define LD_SWITCH_SYSTEM -Xlinker -R/usr/openwin/lib
+#elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x400)
+/* XEmacs: <Georg.Nikodym@canada.sun.com> says you need to turn off
+   the incremental linker with Sunpro C 4, or dynodump won't work. */
+#define LD_SWITCH_SYSTEM -xildoff -R/usr/openwin/lib  
+#else /* not GCC or Sunpro C 4.0 */
+#define LD_SWITCH_SYSTEM -R/usr/openwin/lib
+#endif
+
+/* XEmacs change -- Sun CC needs this to default to ANSI */
+#ifdef __SUNPRO_C
+#define C_SWITCH_SYSTEM -Xa
+#endif /* __SUNPRO_C */
+
+#ifndef NOT_C_CODE
+/* The standard Solaris library nsl has this function in it which is
+   supposed to only be in the BSD compat stuff.  Yuck.  Of course,
+   there isn't a prototype for it other than in /usr/ucbinclude. */
+int gethostname (char *, int);
+
+/* XEmacs: Solaris include files miss this. */
+struct timeval;
+int utimes (char *file, struct timeval *tvp);
+
+/* XEmacs addition: to this to avoid having problems when we later
+   define INT_MAX etc. */
+#include <limits.h>
+#endif
+
+/* XEmacs change -- removed flags to force K & R compilation */
+
+/*
+ * XEmacs change -- some Motif packages need -lgen to get regex and regcmp
+ */
+
+#undef LIBS_SYSTEM
+#define LIBS_SYSTEM -lsocket -lnsl -lkvm -lelf -lgen -ldl
+
+/* XEmacs change -- Mark Borges says this is needed. */
+#define LIBS_TERMCAP -ltermlib 
+
+/* #### XEmacs change: until we've gotten the Energize builds converted
+   over to use configure instead of ymakefile, we still need this.
+ */
+#if defined (NOT_C_CODE) && defined (ENERGIZE)
+
+# define LIB_INTL -L/usr/openwin/lib -lintl -lw
+# define LIBS_DEBUG
+# undef LIBS_SYSTEM
+# define LIBS_SYSTEM -lsocket -lnsl -lintl -lelf -lkvm -lgen -ldl
+# define START_FILES
+# define LD_CMD $(CC)
+
+#endif
+
+/* SYSTEM_MALLOC must be defined if dbx/RTC is going to be used.  dbx/RTC does
+   not work with a static definition of malloc(). */
+/* We want to be able to test out ralloc.c. */
+/* #define SYSTEM_MALLOC */
+
+/* XEmacs: there used to be a special definition of
+   PTY_TTY_NAME_SPRINTF here that was identical to the
+   other SYSV R4 definitions except that it didn't
+   block SIGCHLD around the call to grantpt().  This
+   is *not* in 19.29 and is almost certainly incorrect.
+ */
+
+/* XEmacs change from Georg.Nikodym@Canada.Sun.COM. */
+#ifdef UNEXEC 
+#undef UNEXEC 
+#endif
+#define UNEXEC unexsol2.o
+
+/* XEmacs: Solaris has sigsetjmp but using it leads to core dumps at
+   least under 2.4 */
+#undef _setjmp
+#define _setjmp setjmp