#include <stdio.h>
#if 1 /* I'd really appreciate it if this code could go away... -JimB */
-/* this avoids lossage in the `dual-universe' headers on AT&T SysV X11 */
-#ifdef USG5
+/* This avoids lossage in the `dual-universe' headers on AT&T SysV
+ X11. Don't do it on Solaris, because it breaks compilation with
+ XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris
+ 2 */
+#if defined(USG5) && !defined(SOLARIS2)
#ifndef SYSV
#define SYSV
#endif
-#endif /* USG5 */
+#endif /* USG5 && !SOLARIS2 */
#endif /* 1 */
static int
-file_p (path)
- char *path;
+file_p (filename)
+ char *filename;
{
struct stat status;
- return (access (path, 4) == 0 /* exists and is readable */
- && stat (path, &status) == 0 /* get the status */
+ return (access (filename, 4) == 0 /* exists and is readable */
+ && stat (filename, &status) == 0 /* get the status */
&& (S_ISDIR (status.st_mode)) == 0); /* not a directory */
}
XCloseDisplay (display);
}
#endif /* TESTRM */
+
+/* arch-tag: 37e6fbab-ed05-4363-9e76-6c4109ed511f
+ (do not change this comment) */