From 063079b62e383036dd24cd6465d3db31edf6cb6d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 22:57:17 +0200 Subject: ported ext/intl, bugfixes to go --- ext/intl/breakiterator/codepointiterator_internal.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/codepointiterator_internal.cpp') diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp index bf9239d531..142cc28342 100644 --- a/ext/intl/breakiterator/codepointiterator_internal.cpp +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp @@ -18,9 +18,11 @@ #include #include +#include "php.h" + //copied from cmemory.h, which is not public typedef union { - long t1; + php_int_t t1; double t2; void *t3; } UAlignedMemory; -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/intl/breakiterator/codepointiterator_internal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/codepointiterator_internal.cpp') diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp index 142cc28342..bffd1ee5cf 100644 --- a/ext/intl/breakiterator/codepointiterator_internal.cpp +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp @@ -22,7 +22,7 @@ //copied from cmemory.h, which is not public typedef union { - php_int_t t1; + zend_long t1; double t2; void *t3; } UAlignedMemory; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/intl/breakiterator/codepointiterator_internal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/codepointiterator_internal.cpp') diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp index bffd1ee5cf..723cfd5022 100644 --- a/ext/intl/breakiterator/codepointiterator_internal.cpp +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1