am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."

* commit '595ae39f7f484eb5d2d9e21feeff7e97114b744a': Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
2015-01-13 01:18:48 +00:00
parent cc9efb78fa 595ae39f7f
commit d6c475dc24
1 changed files with 3 additions and 1 deletions
--- a/libs/androidfw/misc.cpp
+++ b/libs/androidfw/misc.cpp
@@ -56,9 +56,11 @@ FileType getFileType(const char* fileName)
            return kFileTypeBlockDev;
        else if (S_ISFIFO(sb.st_mode))
            return kFileTypeFifo;
-#ifdef HAVE_SYMLINKS
+#if defined(S_ISLNK)
        else if (S_ISLNK(sb.st_mode))
            return kFileTypeSymlink;
+#endif
+#if defined(S_ISSOCK)
        else if (S_ISSOCK(sb.st_mode))
            return kFileTypeSocket;
 #endif