diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
| commit | cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28 (patch) | |
| tree | dfcce3d9dbf2a12e10ada6edf2f66dc801cd0fc5 /ext/standard/html.c | |
| parent | 83d45d0a04e3cca8282911c8a384a73297f7375f (diff) | |
| parent | 149568f4da75a148d6ca71073b353f0d5f8f477a (diff) | |
| download | php-git-cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28.tar.gz | |
Merge branch 'master' into refactoring2
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
Diffstat (limited to 'ext/standard/html.c')
| -rw-r--r-- | ext/standard/html.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index 4b605e145c..7564fb8217 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -901,7 +901,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse #if 0 return php_mb2_int_to_char(buf, code); #else -#ifdef ZEND_DEBUG +#if ZEND_DEBUG assert(code <= 0xFFU); #endif *buf = code; @@ -912,7 +912,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse #if 0 /* idem */ return php_mb2_int_to_char(buf, code); #else -#ifdef ZEND_DEBUG +#if ZEND_DEBUG assert(code <= 0xFFU); #endif *buf = code; |