- (stevesk) defines.h: determine _PATH_UNIX_X; currently "/tmp/.X11-unix/X%u"

   for all platforms except HP-UX, which is "/usr/spool/sockets/X11/%u".

2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index babd105c5..c8a79b5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020106
+ - (stevesk) defines.h: determine _PATH_UNIX_X; currently "/tmp/.X11-unix/X%u"
+   for all platforms except HP-UX, which is "/usr/spool/sockets/X11/%u".
+
 20020105
  - (bal) NCR requies use_pipes to operate correctly.
  - (stevesk) fix spurious ; from NCR change.
@@ -7122,4 +7126,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1716 2002/01/05 23:24:27 stevesk Exp $
+$Id: ChangeLog,v 1.1717 2002/01/06 02:32:57 stevesk Exp $
diff --git a/defines.h b/defines.h
index 838f1093b..ab98e6e4f 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.75 2001/10/31 22:32:34 djm Exp $ */
+/* $Id: defines.h,v 1.76 2002/01/06 02:32:57 stevesk Exp $ */
 
 /* Necessary headers */
 
@@ -356,6 +356,16 @@ struct winsize {
 #define _PATH_XAUTH XAUTH_PATH
 #endif /* XAUTH_PATH */
 
+/* derived from XF4/xc/lib/dps/Xlibnet.h */
+#ifndef X_UNIX_PATH
+#ifdef __hpux
+#define X_UNIX_PATH "/usr/spool/sockets/X11/%u"
+#else
+#define X_UNIX_PATH "/tmp/.X11-unix/X%u"
+#endif
+#endif /* X_UNIX_PATH */
+#define _PATH_UNIX_X X_UNIX_PATH
+
 #ifndef _PATH_TTY
 # define _PATH_TTY "/dev/tty"
 #endif