Index: lib/X11/XKBCvt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XKBCvt.c,v
retrieving revision 1.3
diff -u -r1.3 XKBCvt.c
--- lib/X11/XKBCvt.c	13 May 2005 22:53:44 -0000	1.3
+++ lib/X11/XKBCvt.c	10 Nov 2005 04:54:51 -0000
@@ -274,7 +274,12 @@
 #else
         char *cf = __XOS2RedirRoot(CHARSET_FILE);
 #endif
-	if ( (stat(cf,&sbuf)==0) && (sbuf.st_mode&S_IFREG) &&
+
+#ifndef S_ISREG
+# define S_ISREG(mode)   (((mode) & S_IFMT) == S_IFREG)
+#endif
+	
+	if ( (stat(cf,&sbuf)==0) && S_ISREG(sbuf.st_mode) &&
 	    (file = fopen(cf,"r")) ) {
 	    tmp = _XkbAlloc(sbuf.st_size+1);
 	    if (tmp!=NULL) {
Index: lib/Xt/Intrinsic.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xt/Intrinsic.c,v
retrieving revision 1.4
diff -u -r1.4 Intrinsic.c
--- lib/Xt/Intrinsic.c	18 May 2005 15:38:31 -0000	1.4
+++ lib/Xt/Intrinsic.c	10 Nov 2005 04:54:51 -0000
@@ -950,7 +950,7 @@
 #ifndef X_NOT_POSIX
 	    S_ISDIR(status.st_mode) == 0);	/* not a directory */
 #else
-	    (status.st_mode & S_IFDIR) == 0);	/* not a directory */
+	    (status.st_mode & S_IFMT) != S_IFDIR);	/* not a directory */
 #endif /* X_NOT_POSIX else */
 #if defined(WIN32)
     XtStackFree ((XtPointer)bufp, buf);
Index: config/util/lndir.c
===================================================================
RCS file: /cvs/xorg/xc/config/util/lndir.c,v
retrieving revision 1.3
diff -u -r1.3 lndir.c
--- config/util/lndir.c	26 Aug 2004 05:10:56 -0000	1.3
+++ config/util/lndir.c	10 Nov 2005 04:54:51 -0000
@@ -202,7 +202,7 @@
 #ifdef S_ISDIR
 	    if(S_ISDIR(sb.st_mode))
 #else
-	    if (sb.st_mode & S_IFDIR) 
+	    if ((sb.st_mode & S_IFMT) == S_IFDIR)
 #endif
 	    {
 		/* directory */
@@ -371,7 +371,7 @@
 #ifdef S_ISDIR
     if (!(S_ISDIR(ts.st_mode)))
 #else
-    if (!(ts.st_mode & S_IFDIR))
+    if (!(ts.st_mode & S_IFMT) == S_IFDIR)
 #endif
 	quit (2, "%s: Not a directory", tn);
     if (chdir (tn) < 0)
@@ -383,7 +383,7 @@
 #ifdef S_ISDIR
     if (!(S_ISDIR(fs.st_mode)))
 #else
-    if (!(fs.st_mode & S_IFDIR))
+    if (!(fs.st_mode & S_IFMT) == S_IFDIR)
 #endif
 	quit (2, "%s: Not a directory", fn);