3 files changed, 0 insertions, 28 deletions
diff --git a/xpcom/io/nsLocalFile.h b/xpcom/io/nsLocalFile.h
index f7bdb86f7..a8e0a1279 100644
--- a/xpcom/io/nsLocalFile.h
+++ b/xpcom/io/nsLocalFile.h
@@ -91,15 +91,8 @@ nsresultForErrno(int aErr)
     case EROFS: /*     Read-only file system. */
       return NS_ERROR_FILE_READ_ONLY;
 #endif
-    /*
-     * On AIX 4.3, ENOTEMPTY is defined as EEXIST,
-     * so there can't be cases for both without
-     * preprocessing.
-     */
-#if ENOTEMPTY != EEXIST
     case ENOTEMPTY:
       return NS_ERROR_FILE_DIR_NOT_EMPTY;
-#endif /* ENOTEMPTY != EEXIST */
     /* Note that nsIFile.createUnique() returns
        NS_ERROR_FILE_TOO_BIG when it cannot create a temporary
        file with a unique filename.
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 194e5835e..272153bba 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -1591,22 +1591,6 @@ nsLocalFile::IsExecutable(bool* aResult)
 
   // Then check the execute bit.
   *aResult = (access(mPath.get(), X_OK) == 0);
-#ifdef SOLARIS
-  // On Solaris, access will always return 0 for root user, however
-  // the file is only executable if S_IXUSR | S_IXGRP | S_IXOTH is set.
-  // See bug 351950, https://bugzilla.mozilla.org/show_bug.cgi?id=351950
-  if (*aResult) {
-    struct STAT buf;
-
-    *aResult = (STAT(mPath.get(), &buf) == 0);
-    if (*aResult || errno == EACCES) {
-      *aResult = *aResult && (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH));
-      return NS_OK;
-    }
-
-    return NSRESULT_FOR_ERRNO();
-  }
-#endif
   if (*aResult || errno == EACCES) {
     return NS_OK;
   }
diff --git a/xpcom/io/nsLocalFileUnix.h b/xpcom/io/nsLocalFileUnix.h
index 9a3e7d6af..5ef581ed1 100644
--- a/xpcom/io/nsLocalFileUnix.h
+++ b/xpcom/io/nsLocalFileUnix.h
@@ -65,11 +65,6 @@
 // stat64 and lstat64 are deprecated on OS X. Normal stat and lstat are
 // 64-bit by default on OS X 10.6+.
 #if defined(HAVE_STAT64) && defined(HAVE_LSTAT64) && !defined(XP_DARWIN)
-  #if defined (AIX)
-    #if defined STAT
-      #undef STAT
-    #endif
-  #endif
   #define STAT stat64
   #define LSTAT lstat64
   #define HAVE_STATS64 1