com php-src: Better version checking: ext/intl/collator/collato r_convert.c
| From: | Xinchen Hui | Date: | Fri, 15 Aug 2014 10:39:45 +0000 |
| Subject: | com php-src: Better version checking: ext/intl/collator/collato r_convert.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80556@lists.php.net to get a copy of this message | ||
Commit: 7af24dcb474fbc92a324e1c939ab0ac7a5c65346
Author: Xinchen Hui <laruence@php.net> Fri, 15 Aug 2014 18:39:45 +0800
Parents: 617b1759c4f0e3160bdfcc346ee668e9dda2fad8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7af24dcb474fbc92a324e1c939ab0ac7a5c65346
Log:
Better version checking
Changed paths:
M ext/intl/collator/collator_convert.c
Diff:
diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert..c
index 1d86815..e64bf88 100644
--- a/ext/intl/collator/collator_convert.c
+++ b/ext/intl/collator/collator_convert.c
@@ -28,7 +28,7 @@
#include <unicode/ustring.h>
#include <php.h>
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 1)
+#if PHP_VERSION_ID <= 51000
#define CAST_OBJECT_SHOULD_FREE ,0
#else
#define CAST_OBJECT_SHOULD_FREE