Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.120
diff -u -p -r1.120 ChangeLog
--- ChangeLog	6 Oct 2004 23:25:34 -0000	1.120
+++ ChangeLog	28 Dec 2004 15:26:35 -0000
@@ -1,3 +1,8 @@
+2004-12-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lib/listdir.c: add a better definition of S_ISSOCK, that works
+	with SCO OpenServer.
+
 2004-10-05  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* xforms.spec.in: Updating SO_VERSION revealed a flaw in the logic
Index: lib/listdir.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/listdir.c,v
retrieving revision 1.8
diff -u -p -r1.8 listdir.c
--- lib/listdir.c	18 May 2004 13:57:45 -0000	1.8
+++ lib/listdir.c	28 Dec 2004 15:26:35 -0000
@@ -104,9 +104,18 @@ char *fl_id_dlist = "$Id: listdir.c,v 1.
 #define S_ISCHR(m)      (((m) & S_IFCHR) == S_IFCHR)
 #endif
 
-#if !defined(S_ISSOCK) && defined(S_IFSOCK)
-#define S_ISSOCK(m)      (((m) & S_IFSOCK) == S_IFSOCK)
-#endif
+#ifndef S_ISSOCK
+# if defined( S_IFSOCK )
+#   ifdef S_IFMT
+#     define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+#   else
+#     define S_ISSOCK(m) ((m) & S_IFSOCK)
+#   endif /* S_IFMT */
+# elif defined( S_ISNAM )
+    /* SCO OpenServer 5.0.7 */
+#   define S_ISSOCK S_ISNAM
+# endif /* !S_IFSOCK && S_ISNAM */
+#endif /* !S_ISSOCK */
 
 #define MAXCACHE 10		/* upto MAXCHCHE dir will be cached */
 #define MAXFL  (FL_PATH_MAX + FL_FLEN)	/* maximum file length */