From 1bf248123399daf8d4bee9c30ba13b9887e5001e Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 12 Jan 2015 14:33:04 -0800
Subject: Use more intention-revealing tests for S_ISLNK and S_ISSOCK.

Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
---
 libs/androidfw/misc.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libs/androidfw/misc.cpp')

diff --git a/libs/androidfw/misc.cpp b/libs/androidfw/misc.cpp
index 29686efe3753..a9b46d2808f2 100644
--- 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
-- 
cgit v1.2.3-59-g8ed1b