(GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.

[gnu-emacs] / src / s / sol2-3.h

diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 7d614f8e12ac3385fb583b17bbd2fcdddfb648b4..a4fc6097905c5d6a4566a18f4c61038157e66d78 100644 (file)
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -1,4 +1,4 @@
-#include <s/sol2.h>
+#include "sol2.h"
 
 /* Solaris 2.3 has a bug in XListFontsWithInfo.  */
 #define BROKEN_XLISTFONTSWITHINFO
@@ -10,5 +10,41 @@
 #ifndef __GNUC__
 #define LD_SWITCH_SYSTEM -L /usr/ccs/lib LD_SWITCH_X_SITE_AUX
 #else /* GCC */
-#define LD_SWITCH_SYSTEM -L /usr/ccs/lib -Xlinker LD_SWITCH_X_SITE_AUX
+/* 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 src.  Luckily lib-src does not use LD_SWITCH_SYSTEM.  */
+#define LD_SWITCH_SYSTEM -L /usr/ccs/lib \
+ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX`
 #endif /* GCC */
+
+/* Info from fnf@cygnus.com suggests this is appropriate.  */
+#define POSIX_SIGNALS
+
+/* We don't need the definition from usg5-3.h with POSIX_SIGNALS.  */
+#undef sigsetmask
+
+/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
+   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
+   (x<2) but I'm not sure.   fnf@cygnus.com */
+/* This sets the name of the slave side of the PTY.  On SysVr4,
+   grantpt(3) forks a subprocess, so keep sigchld_handler() from
+   intercepting that death.  If any child but grantpt's should die
+   within, it should be caught after sigrelse(2). */
+
+#undef PTY_TTY_NAME_SPRINTF
+#define PTY_TTY_NAME_SPRINTF                   \
+  {                                            \
+    char *ptsname (), *ptyname;                        \
+                                               \
+    sigblock (sigmask (SIGCLD));               \
+    if (grantpt (fd) == -1)                    \
+      { emacs_close (fd); return -1; }         \
+    sigunblock (sigmask (SIGCLD));             \
+    if (unlockpt (fd) == -1)                   \
+      { emacs_close (fd); return -1; }         \
+    if (!(ptyname = ptsname (fd)))             \
+      { emacs_close (fd); return -1; }         \
+    strncpy (pty_name, ptyname, sizeof (pty_name)); \
+    pty_name[sizeof (pty_name) - 1] = 0;       \
+  }