From 4417421ab6133ce0658e285a4e48d93a27931820 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@php.net>
Date: Fri, 18 Oct 2013 10:33:53 +0800
Subject: [PATCH] Retruning SUCCESS/FAILURE instead of int

---
 UPGRADING           | 2 ++
 ext/phar/php_phar.h | 1 -
 ext/phar/util.c     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 39fe2d73692..43e4118b212 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -343,6 +343,8 @@ None
 
 - Intl:
   - This extension now requires ICU 4.0+.
+- Phar:
+  - Added ability of resolving alias created by Phar::map
 
 ========================================
 9. New Global Constants
diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h
index 4146e28f770..f8325d0c635 100644
--- a/ext/phar/php_phar.h
+++ b/ext/phar/php_phar.h
@@ -34,7 +34,6 @@ extern zend_module_entry phar_module_entry;
 #define PHP_PHAR_API PHPAPI
 #endif
 
-#define PHAR_HAVE_RESOLVE_ALIAS
 PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC);
 
 #endif /* PHP_PHAR_H */
diff --git a/ext/phar/util.c b/ext/phar/util.c
index e9f1b1673c3..dc4508f91cd 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -1190,9 +1190,9 @@ PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename,
 	if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void**)&fd_ptr)) {
 		*filename = (*fd_ptr)->fname;
 		*filename_len = (*fd_ptr)->fname_len;
-		return 1;
+		return SUCCESS;
 	}
-	return 0;
+	return FAILURE;
 }
 /* }}} */