X11 display issues

[Wendy Palm]

you are, of course, correct.  i knew that, but did it wrong anyway.

here is a resend, in a more proper format-


--- defines.h.orig      Thu Feb 22 13:53:46 2001
+++ defines.h   Thu Feb 22 14:06:06 2001
@@ -138,12 +138,20 @@
 # if (SIZEOF_SHORT_INT == 2)
 typedef short int int16_t;
 # else
-#  error "16 bit int type not found."
+#  ifdef _CRAY
+typedef long  int16_t;
+#  else
+#   error "16 bit int type not found."
+#  endif /* _CRAY */
 # endif
 # if (SIZEOF_INT == 4)
 typedef int int32_t;
 # else
-#  error "32 bit int type not found."
+#  ifdef _CRAY
+typedef long  int32_t;
+#  else
+#   error "32 bit int type not found."
+#  endif /* _CRAY */
 # endif
 #endif
 
@@ -163,12 +171,20 @@
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else
-#   error "16 bit int type not found."
+#   ifdef _CRAY
+typedef unsigned long  u_int16_t;
+#   else
+#    error "16 bit int type not found."
+#   endif
 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else
-#   error "32 bit int type not found."
+#   ifdef _CRAY
+typedef unsigned long  u_int32_t;
+#   else
+#    error "32 bit int type not found."
+#   endif
 #  endif
 # endif
 #endif
@@ -396,6 +412,13 @@
 
 #ifndef GETPGRP_VOID
 # define getpgrp() getpgrp(0)
+#endif
+
+/*
+ * Some systems don't allow unix sockets with X11.
+ */
+#if defined(HAVE_CYGWIN)||defined(_CRAY) /* Unix sockets are not supported */
+#define NO_X11_UNIX_SOCKETS
 #endif
 
 /*

=========================================================
--- session.c.orig      Thu Feb 22 13:53:47 2001
+++ session.c   Thu Feb 22 13:56:19 2001
@@ -540,6 +540,7 @@
                do_child(command, pw, NULL, s->display, s->auth_proto, s->auth_data, NULL);
                /* NOTREACHED */
        }
+
 #ifdef HAVE_CYGWIN
        if (is_winnt)
                cygwin_set_impersonation_token(INVALID_HANDLE_VALUE);
@@ -639,6 +640,7 @@
                    s->auth_data, s->tty);
                /* NOTREACHED */
        }
+
 #ifdef HAVE_CYGWIN
        if (is_winnt)
                cygwin_set_impersonation_token(INVALID_HANDLE_VALUE);
@@ -1366,13 +1368,13 @@
                                            "Running %.100s add %.100s %.100s %.100s\n",
                                            options.xauth_location, display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
+#ifndef NO_X11_UNIX_SOCKETS
                                        if (screen != NULL)
                                                fprintf(stderr,
                                                    "Adding %.*s/unix%s %s %s\n",
                                                    (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
-#endif
+#endif /* NO_X11_UNIX_SOCKETS */
                                }
                                snprintf(cmd, sizeof cmd, "%s -q -",
                                    options.xauth_location);
@@ -1380,12 +1382,12 @@
                                if (f) {
                                        fprintf(f, "add %s %s %s\n", display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
+#ifndef NO_X11_UNIX_SOCKETS
                                        if (screen != NULL)
                                                fprintf(f, "add %.*s/unix%s %s %s\n",
                                                    (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
-#endif
+#endif /* NO_X11_UNIX_SOCKETS */
                                        pclose(f);
                                } else {
                                        fprintf(stderr, "Could not run %s\n",


Jim Knoble wrote:
> Wendy, you'll want to resend those patches using 'diff -u' (if you have
> GNU diffutils installed) or at least 'diff -c' (if you don't).  Patches
> containing unified or context diffs are much easier both for humans to
> read and for 'patch' to apply.
> 
> --
> jim knoble | jmknoble at jmknoble.cx | http://www.jmknoble.cx/

-- 
wendy palm
Cray OS Sustaining Engineering, Cray Inc.
wendyp at cray.com, 651-605-9154