From: Anatol Belski <ab@php.net>
Date: Mon, 25 May 2015 11:21:01 +0000 (+0200)
Subject: cleanup duplicated stat declarations in ext/phar
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~32^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4c07e7e76182605f17848b6af3b41ee51039dc7;p=php

cleanup duplicated stat declarations in ext/phar
---

diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 8cadeb5a4a..c4912649db 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -429,18 +429,6 @@ skip_phar:
 }
 /* }}} */
 
-#ifndef S_ISDIR
-#define S_ISDIR(mode)	(((mode)&S_IFMT) == S_IFDIR)
-#endif
-#ifndef S_ISREG
-#define S_ISREG(mode)	(((mode)&S_IFMT) == S_IFREG)
-#endif
-#ifndef S_ISLNK
-#define S_ISLNK(mode)	(((mode)&S_IFMT) == S_IFLNK)
-#endif
-
-#define S_IXROOT ( S_IXUSR | S_IXGRP | S_IXOTH )
-
 #define IS_LINK_OPERATION(__t) ((__t) == FS_TYPE || (__t) == FS_IS_LINK || (__t) == FS_LSTAT)
 #define IS_EXISTS_CHECK(__t) ((__t) == FS_EXISTS  || (__t) == FS_IS_W || (__t) == FS_IS_R || (__t) == FS_IS_X || (__t) == FS_IS_FILE || (__t) == FS_IS_DIR || (__t) == FS_IS_LINK)
 #define IS_ABLE_CHECK(__t) ((__t) == FS_IS_R || (__t) == FS_IS_W || (__t) == FS_IS_X)
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 81b08de36a..52df81971b 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -460,9 +460,7 @@ bail:
 		entry.flags = phar_tar_number(hdr->mode, sizeof(hdr->mode)) & PHAR_ENT_PERM_MASK;
 		entry.timestamp = phar_tar_number(hdr->mtime, sizeof(hdr->mtime));
 		entry.is_persistent = myphar->is_persistent;
-#ifndef S_ISDIR
-#define S_ISDIR(mode)	(((mode)&S_IFMT) == S_IFDIR)
-#endif
+
 		if (old && entry.tar_type == TAR_FILE && S_ISDIR(entry.flags)) {
 			entry.tar_type = TAR_DIR;
 		}