diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-13 20:32:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 20:32:52 +0000 |
| commit | c2b7abdbb2637d13f3dedaf93131a742b7db36c1 (patch) | |
| tree | 4ee065647f340186d42e41e1332c841e41914e50 /libs/androidfw | |
| parent | abccd9d3c90ed80bac1828747fb900754444a864 (diff) | |
| parent | 1e14722167210e176cc1f6e702f1a7a98271c6d2 (diff) | |
| download | frameworks_base-c2b7abdbb2637d13f3dedaf93131a742b7db36c1.zip frameworks_base-c2b7abdbb2637d13f3dedaf93131a742b7db36c1.tar.gz frameworks_base-c2b7abdbb2637d13f3dedaf93131a742b7db36c1.tar.bz2 | |
am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."
* commit '1e14722167210e176cc1f6e702f1a7a98271c6d2':
Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/misc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/androidfw/misc.cpp b/libs/androidfw/misc.cpp index ea54cc5..5285420 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 |