|
Line
Link Here
|
| 0 |
-- php-7.0.32/ext/intl/breakiterator/codepointiterator_internal.h.orig 2018-10-05 11:39:33.519829566 -0700 |
0 |
++ php-7.0.32/ext/intl/breakiterator/codepointiterator_internal.h 2018-10-05 11:34:17.485817630 -0700 |
|
Lines 19-24
Link Here
|
| 19 |
|
19 |
|
| 20 |
#include <unicode/brkiter.h> |
20 |
#include <unicode/brkiter.h> |
| 21 |
|
21 |
|
|
|
22 |
using namespace icu; |
| 23 |
|
| 22 |
using U_ICU_NAMESPACE::BreakIterator; |
24 |
using U_ICU_NAMESPACE::BreakIterator; |
| 23 |
|
25 |
|
| 24 |
namespace PHP { |
26 |
namespace PHP { |
| 25 |
-- php-7.0.32/ext/intl/intl_data.h.orig 2018-10-05 11:39:33.543829795 -0700 |
27 |
++ php-7.0.32/ext/intl/intl_data.h 2018-10-05 11:34:23.161871764 -0700 |
|
Lines 23-28
Link Here
|
| 23 |
|
23 |
|
| 24 |
#include "intl_error.h" |
24 |
#include "intl_error.h" |
| 25 |
|
25 |
|
|
|
26 |
#ifdef __cplusplus |
| 27 |
using namespace icu; |
| 28 |
#endif |
| 29 |
|
| 26 |
/* Mock object to generalize error handling in sub-modules. |
30 |
/* Mock object to generalize error handling in sub-modules. |
| 27 |
Sub-module data structures should always have error as first element |
31 |
Sub-module data structures should always have error as first element |
| 28 |
for this to work! |
32 |
for this to work! |
| 29 |
-- php-7.0.32/ext/intl/common/common_enum.h.orig 2018-10-05 11:39:33.600830338 -0700 |
33 |
++ php-7.0.32/ext/intl/common/common_enum.h 2018-10-05 11:34:36.564999586 -0700 |
|
Lines 29-34
Link Here
|
| 29 |
#include "../intl_data.h" |
29 |
#include "../intl_data.h" |
| 30 |
#ifdef __cplusplus |
30 |
#ifdef __cplusplus |
| 31 |
} |
31 |
} |
|
|
32 |
using namespace icu; |
| 32 |
#endif |
33 |
#endif |
| 33 |
|
34 |
|
| 34 |
#define INTLITERATOR_ERROR(ii) (ii)->err |
35 |
#define INTLITERATOR_ERROR(ii) (ii)->err |
| 35 |
-- php-7.0.32/ext/intl/intl_convertcpp.h.orig 2018-10-05 11:39:33.640830719 -0700 |
36 |
++ php-7.0.32/ext/intl/intl_convertcpp.h 2018-10-05 11:34:48.296111454 -0700 |
|
Lines 26-31
Link Here
|
| 26 |
#include <unicode/unistr.h> |
26 |
#include <unicode/unistr.h> |
| 27 |
#include <zend_types.h> |
27 |
#include <zend_types.h> |
| 28 |
|
28 |
|
|
|
29 |
using namespace icu; |
| 30 |
|
| 29 |
int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status); |
31 |
int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status); |
| 30 |
|
32 |
|
| 31 |
zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status); |
33 |
zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status); |
| 32 |
-- php-7.0.32/ext/intl/php_intl.h.orig 2018-10-05 11:39:33.673831033 -0700 |
34 |
++ php-7.0.32/ext/intl/php_intl.h 2018-10-05 11:34:55.517180312 -0700 |
|
Lines 32-37
Link Here
|
| 32 |
#include "intl_error.h" |
32 |
#include "intl_error.h" |
| 33 |
#include "Zend/zend_exceptions.h" |
33 |
#include "Zend/zend_exceptions.h" |
| 34 |
|
34 |
|
|
|
35 |
#ifdef __cplusplus |
| 36 |
using namespace icu; |
| 37 |
#endif |
| 38 |
|
| 35 |
extern zend_module_entry intl_module_entry; |
39 |
extern zend_module_entry intl_module_entry; |
| 36 |
#define phpext_intl_ptr &intl_module_entry |
40 |
#define phpext_intl_ptr &intl_module_entry |
| 37 |
|
41 |
|
