Simplify fallback code for systems without S_ISDIR

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 4 insertions, 12 deletions

diff --git a/toc.c b/toc.c
index 2a1d507..854ae2d 100644
--- a/toc.c
+++ b/toc.c
@@ -35,6 +35,10 @@
 
 #include <sys/stat.h>
 
+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
+#endif
+
 static int IsDir(char *name)
 {
     char str[500];
@@ -44,11 +48,7 @@ static int IsDir(char *name)
     if (snprintf(str, sizeof(str), "%s/%s", app_resources.mail_path, name)
         >= sizeof(str)) return False;
     if (stat(str, &buf) /* failed */) return False;
-#ifdef S_ISDIR
     return S_ISDIR(buf.st_mode);
-#else
-    return (buf.st_mode & S_IFMT) == S_IFDIR;
-#endif
 }
 
 
@@ -99,11 +99,7 @@ static void MakeSureSubfolderExists(
 	if (stat(subfolder_path, &buf) /* failed */)
 	    Punt("Can't create new xmh subfolder!");
     }
-#ifdef S_ISDIR
     if (!S_ISDIR(buf.st_mode))
-#else
-    if ((buf.st_mode & S_IFMT) != S_IFDIR)
-#endif
       punt:
 	Punt("Can't create new xmh subfolder!");
 }
@@ -116,11 +112,7 @@ int TocFolderExists(Toc toc)
                    app_resources.mail_path, toc->foldername);
     }
     return ((stat(toc->path, &buf) == 0) &&
-#ifdef S_ISDIR
 	    (S_ISDIR(buf.st_mode)));
-#else
-	    ((buf.st_mode & S_IFMT) == S_IFDIR));
-#endif
 }
 
 static void LoadCheckFiles(void)